diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-26 04:11:04 +0300 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-26 04:16:32 +0300 |
| commit | 431107ea5b680a24a4d01fbd3a178a3eb932f378 (patch) | |
| tree | 6515a616e8ed60480e169188e630936794be2c77 /arch/arm/mach-s3c64xx/include/mach/entry-macro.S | |
| parent | ab5d97db1c6ced3e95c00d097931471707032b1f (diff) | |
| download | linux-431107ea5b680a24a4d01fbd3a178a3eb932f378.tar.xz | |
ARM: S3C64XX: Merge mach-s3c6400 and mach-s3c6410
As per discussions with Russell King on linux-arm-kernel, it appears that
both mach-s3c6400 and mach-s3c6410 are so close together that they should
simply be merged into mach-s3c64xx.
Note, this patch does not eliminate any of the bits that are still common,
it is simply a move of the two directories together, any further common
code will be eliminated or moved in further patches.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c64xx/include/mach/entry-macro.S')
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/entry-macro.S | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/entry-macro.S b/arch/arm/mach-s3c64xx/include/mach/entry-macro.S new file mode 100644 index 000000000000..33a8fe240882 --- /dev/null +++ b/arch/arm/mach-s3c64xx/include/mach/entry-macro.S @@ -0,0 +1,18 @@ +/* arch/arm/mach-s3c6400/include/mach/entry-macro.S + * + * Copyright 2008 Openmoko, Inc. + * Copyright 2008 Simtec Electronics + * http://armlinux.simtec.co.uk/ + * Ben Dooks <ben@simtec.co.uk> + * + * Low-level IRQ helper macros for the Samsung S3C64XX series + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. +*/ + +#include <mach/map.h> +#include <plat/irqs.h> + +#include <asm/entry-macro-vic2.S> |