diff options
| author | Rabin Vincent <rabin.vincent@stericsson.com> | 2010-12-08 00:38:01 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@stericsson.com> | 2011-01-10 12:34:54 -0500 |
| commit | d2a40972ec70bd2060d3c46050a101a9678d2991 (patch) | |
| tree | 7583e0e604bdb168f96f20277d4f63bcbf3ea409 /arch/arm/configs | |
| parent | 5ec65521c99178a87f4c859101a92c36f4701fd7 (diff) | |
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>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/u8500_defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index be80f037f85a..52d86c4485bf 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig | |||
| @@ -9,6 +9,10 @@ CONFIG_MODULE_UNLOAD=y | |||
| 9 | # CONFIG_LBDAF is not set | 9 | # CONFIG_LBDAF is not set |
| 10 | # CONFIG_BLK_DEV_BSG is not set | 10 | # CONFIG_BLK_DEV_BSG is not set |
| 11 | CONFIG_ARCH_U8500=y | 11 | CONFIG_ARCH_U8500=y |
| 12 | CONFIG_UX500_SOC_DB5500=y | ||
| 13 | CONFIG_UX500_SOC_DB8500=y | ||
| 14 | CONFIG_MACH_U8500=y | ||
| 15 | CONFIG_MACH_U5500=y | ||
| 12 | CONFIG_SMP=y | 16 | CONFIG_SMP=y |
| 13 | CONFIG_NR_CPUS=2 | 17 | CONFIG_NR_CPUS=2 |
| 14 | CONFIG_PREEMPT=y | 18 | CONFIG_PREEMPT=y |