diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-25 17:13:07 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-25 17:13:07 -0400 |
| commit | 1c49cb09b5666aa0d6df3b58f6c621df92c5dd44 (patch) | |
| tree | d6a35f8063d31033bf8059a296ba8dfbf046a373 /arch/arm/configs | |
| parent | d79a08c56985fd3d7bd158687a1a162697935349 (diff) | |
| parent | 05f689400ea5fa3d71af82f910c8b140f87ad1f3 (diff) | |
Merge commit '05f6894' (omap-for-linus) into linaro-2.6.38
Conflicts:
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/usb-musb.c
arch/arm/plat-omap/include/plat/usb.h
drivers/usb/musb/musb_core.h
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index ae890caa17a..019fb7c67dc 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -58,6 +58,7 @@ CONFIG_ARM_ERRATA_411920=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_SMP=y +CONFIG_NR_CPUS=2 # CONFIG_LOCAL_TIMERS is not set CONFIG_AEABI=y CONFIG_LEDS=y |