aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/configs/u8500_defconfig
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2010-12-08 11:08:01 +0530
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-01-11 13:44:34 -0500
commit557cf11124079901fa6fea34709a678f4c2ea747 (patch)
treeca56f8b12cdec7cb45d1db345f57da1309e336a2 /arch/arm/configs/u8500_defconfig
parent6411b487b05b6db8f6895fd9f443d5ab89f3735d (diff)
ux500: allow 5500 and 8500 to be built togetherlinaro-linux-2.6.37-upstream-12Jan2011
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> (cherry picked from commit d2a40972ec70bd2060d3c46050a101a9678d2991)
Diffstat (limited to 'arch/arm/configs/u8500_defconfig')
-rw-r--r--arch/arm/configs/u8500_defconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index be80f037f85..52d86c4485b 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -9,6 +9,10 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_LBDAF is not set
# CONFIG_BLK_DEV_BSG is not set
CONFIG_ARCH_U8500=y
+CONFIG_UX500_SOC_DB5500=y
+CONFIG_UX500_SOC_DB8500=y
+CONFIG_MACH_U8500=y
+CONFIG_MACH_U5500=y
CONFIG_SMP=y
CONFIG_NR_CPUS=2
CONFIG_PREEMPT=y