diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-11 22:01:45 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-11 22:01:45 -0800 |
| commit | 01c728a246a1072fe9664b91179a47937182b0a0 (patch) | |
| tree | ca1e1d997284777b28981040dae97ee668aadaee /drivers/input/keyboard/Kconfig | |
| parent | 554738da71004d96e06fb75f4772dfc3b0f47810 (diff) | |
| parent | 50a88cb7eddb971077ae7dff76b116747c12c371 (diff) | |
| download | kernel_samsung_smdk4412-01c728a246a1072fe9664b91179a47937182b0a0.zip kernel_samsung_smdk4412-01c728a246a1072fe9664b91179a47937182b0a0.tar.gz kernel_samsung_smdk4412-01c728a246a1072fe9664b91179a47937182b0a0.tar.bz2 | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/keyboard/Kconfig')
| -rw-r--r-- | drivers/input/keyboard/Kconfig | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index e98beae..89bd912 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -12,18 +12,6 @@ menuconfig INPUT_KEYBOARD if INPUT_KEYBOARD -config KEYBOARD_AAED2000 - tristate "AAED-2000 keyboard" - depends on MACH_AAED2000 - select INPUT_POLLDEV - default y - help - Say Y here to enable the keyboard on the Agilent AAED-2000 - development board. - - To compile this driver as a module, choose M here: the - module will be called aaed2000_kbd. - config KEYBOARD_ADP5520 tristate "Keypad Support for ADP5520 PMIC" depends on PMIC_ADP5520 |