commit d2a40972ec70bd2060d3c46050a101a9678d2991
author Rabin Vincent <rabin.vincent@stericsson.com> Wed Dec 08 11:08:01 2010 +0530
committer Linus Walleij <linus.walleij@stericsson.com> Mon Jan 10 18:34:54 2011 +0100
tree 7583e0e604bdb168f96f20277d4f63bcbf3ea409
parent 5ec65521c99178a87f4c859101a92c36f4701fd7

ux500: allow 5500 and 8500 to be built together

Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>

arch/arm/configs/u8500_defconfig

diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index be80f03..52d86c4 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -9,6 +9,10 @@
 # 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