diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 11:13:00 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 11:13:00 +0100 |
| commit | 9ae21ca362679757786f5abe556c7943e9001426 (patch) | |
| tree | db4ab371195fed9d327745eaf12c912f3f74f0e2 /arch/arm/configs | |
| parent | 12ba8d1e9262ce81a695795410bd9ee5c9407ba1 (diff) | |
| parent | a3484ffd2acc196ca934369395fe9aac63ed1a47 (diff) | |
| download | blackbird-op-linux-9ae21ca362679757786f5abe556c7943e9001426.tar.gz blackbird-op-linux-9ae21ca362679757786f5abe556c7943e9001426.zip | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/mx51_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/mx51_defconfig b/arch/arm/configs/mx51_defconfig index 163cfee7644c..5c7a87260fab 100644 --- a/arch/arm/configs/mx51_defconfig +++ b/arch/arm/configs/mx51_defconfig @@ -82,6 +82,7 @@ CONFIG_FEC=y CONFIG_INPUT_FF_MEMLESS=m # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y +CONFIG_KEYBOARD_GPIO=y CONFIG_INPUT_EVBUG=m CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ELANTECH=y |
