Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6

[cascardo/linux.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index c76bd31..7b3c0b8 100644 (file)
--- 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
@@ -196,20 +184,22 @@ config KEYBOARD_GPIO_POLLED
          module will be called gpio_keys_polled.
 
 config KEYBOARD_TCA6416
-       tristate "TCA6416 Keypad Support"
+       tristate "TCA6416/TCA6408A Keypad Support"
        depends on I2C
        help
          This driver implements basic keypad functionality
-         for keys connected through TCA6416 IO expander
+         for keys connected through TCA6416/TCA6408A IO expanders.
 
          Say Y here if your device has keys connected to
-         TCA6416 IO expander. Your board-specific setup logic
+         TCA6416/TCA6408A IO expander. Your board-specific setup logic
          must also provide pin-mask details(of which TCA6416 pins
          are used for keypad).
 
-         If enabled the complete TCA6416 device will be managed through
+         If enabled the entire TCA6416 device will be managed through
          this driver.
 
+         To compile this driver as a module, choose M here: the
+         module will be called tca6416_keypad.
 
 config KEYBOARD_MATRIX
        tristate "GPIO driven matrix keypad support"
@@ -459,6 +449,15 @@ config KEYBOARD_OMAP4
          To compile this driver as a module, choose M here: the
          module will be called omap4-keypad.
 
+config KEYBOARD_SPEAR
+       tristate "ST SPEAR keyboard support"
+       depends on PLAT_SPEAR
+       help
+         Say Y here if you want to use the SPEAR keyboard.
+
+         To compile this driver as a module, choose M here: the
+         module will be called spear-keboard.
+
 config KEYBOARD_TC3589X
        tristate "TC3589X Keypad support"
        depends on MFD_TC3589X