Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e136110 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents df072717 b3212ca3
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_ARCH_LPC32XX=y
CONFIG_KEYBOARD_GPIO_POLLED=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -89,6 +90,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
CONFIG_INPUT_EVDEV=y
# CONFIG_KEYBOARD_ATKBD is not set
CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_LPC32XX=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_TOUCHSCREEN=y