diff options
author | Linus Walleij <linus.walleij@stericsson.com> | 2009-04-27 05:21:46 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-28 17:44:29 -0400 |
commit | d98aac7592114241f378bc8d5b3e424cced7ded2 (patch) | |
tree | 2d052df037411e94478d5ee4ff43402a45fd8fe4 /arch/arm/Makefile | |
parent | bb3cee2b35d2b9edab71997bd06040ff37483e08 (diff) |
[ARM] 5480/1: U300-v5 integrate into the ARM architecture
This hooks the U300 support into Kbuild and makes a small hook
in mmu.c for supporting an odd memory alignment with shared memory
on these systems.
This is rebased to RMK:s GIT HEAD. This patch tries to add the
Kconfig option in alphabetic order by option text and the Makefile
entry after config symbol.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 885a83724b9c..20084c50c23c 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -149,6 +149,7 @@ machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 | |||
149 | machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410 | 149 | machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410 |
150 | machine-$(CONFIG_ARCH_SA1100) := sa1100 | 150 | machine-$(CONFIG_ARCH_SA1100) := sa1100 |
151 | machine-$(CONFIG_ARCH_SHARK) := shark | 151 | machine-$(CONFIG_ARCH_SHARK) := shark |
152 | machine-$(CONFIG_ARCH_U300) := u300 | ||
152 | machine-$(CONFIG_ARCH_VERSATILE) := versatile | 153 | machine-$(CONFIG_ARCH_VERSATILE) := versatile |
153 | machine-$(CONFIG_ARCH_W90X900) := w90x900 | 154 | machine-$(CONFIG_ARCH_W90X900) := w90x900 |
154 | machine-$(CONFIG_FOOTBRIDGE) := footbridge | 155 | machine-$(CONFIG_FOOTBRIDGE) := footbridge |