aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-07-03 15:43:12 -0400
committerArnd Bergmann <arnd@arndb.de>2012-07-03 15:43:12 -0400
commit4e1361100e79a65c36783929bf9df2be1be95b03 (patch)
tree334db8c2d63424ad9bd525c5df048fbdd7c2753a
parentdf072717eb0050326f0f63eed98200412c395831 (diff)
parentb3212ca31dea62bb9b129af36398e6cee05d2bd9 (diff)
Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/defconfig
defconfig updates for lpc32xx, depends on the earlier lpc32xx-next branch. * 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6: ARM: LPC32xx: Defconfig update Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/configs/lpc32xx_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/lpc32xx_defconfig b/arch/arm/configs/lpc32xx_defconfig
index eceed186a3c1..e42a0e3d4c3a 100644
--- a/arch/arm/configs/lpc32xx_defconfig
+++ b/arch/arm/configs/lpc32xx_defconfig
@@ -18,6 +18,7 @@ CONFIG_MODULE_UNLOAD=y
18# CONFIG_BLK_DEV_BSG is not set 18# CONFIG_BLK_DEV_BSG is not set
19CONFIG_PARTITION_ADVANCED=y 19CONFIG_PARTITION_ADVANCED=y
20CONFIG_ARCH_LPC32XX=y 20CONFIG_ARCH_LPC32XX=y
21CONFIG_KEYBOARD_GPIO_POLLED=y
21CONFIG_PREEMPT=y 22CONFIG_PREEMPT=y
22CONFIG_AEABI=y 23CONFIG_AEABI=y
23CONFIG_ZBOOT_ROM_TEXT=0x0 24CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -89,6 +90,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
89CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 90CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
90CONFIG_INPUT_EVDEV=y 91CONFIG_INPUT_EVDEV=y
91# CONFIG_KEYBOARD_ATKBD is not set 92# CONFIG_KEYBOARD_ATKBD is not set
93CONFIG_KEYBOARD_GPIO=y
92CONFIG_KEYBOARD_LPC32XX=y 94CONFIG_KEYBOARD_LPC32XX=y
93# CONFIG_INPUT_MOUSE is not set 95# CONFIG_INPUT_MOUSE is not set
94CONFIG_INPUT_TOUCHSCREEN=y 96CONFIG_INPUT_TOUCHSCREEN=y