diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 16:33:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 16:33:28 -0700 |
| commit | a17f29a5e98c0a32a900a773083c719e27f4bc0e (patch) | |
| tree | d45a539a39c93056a68cf825610517b7358fa89e /arch/arm/configs/lpc32xx_defconfig | |
| parent | f01b9b73f57f4f92d39bba0d9aa4a38f318212df (diff) | |
| parent | 2d05bf6ef7391ac3642ab62bc3a649fdb32731fe (diff) | |
Merge tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc defconfig updates from Arnd Bergmann:
"These are changes to the default configuration files, to account for
kernel changes and new hardware."
* tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: exynos_defconfig: enable more platforms in defconfig
ARM: imx_v4_v5_defconfig: update features
ARM: imx_v6_v7_defconfig: update features
ARM: mxs: defconfig: Enable CONFIG_COMMON_CLK_DEBUG
ARM: mxs_defconfig: Enable RTC driver
ARM: LPC32xx: Defconfig update
ARM: mxs_defconfig: Let AUART driver be built by default
ARM: mxs: Enable MACH_APX4DEVKIT
ARM: mxs: Let GPMI driver be built by default
ARM: tegra: defconfig updates
Diffstat (limited to 'arch/arm/configs/lpc32xx_defconfig')
| -rw-r--r-- | arch/arm/configs/lpc32xx_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/lpc32xx_defconfig b/arch/arm/configs/lpc32xx_defconfig index eceed186a3c..e42a0e3d4c3 100644 --- a/arch/arm/configs/lpc32xx_defconfig +++ b/arch/arm/configs/lpc32xx_defconfig @@ -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 |