Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 0dddbb04868e3e67d2a3eb85efbef86953627a93..54395433219dbbefb6af28c9f02da257b9fe5896 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -208,6 +208,27 @@ config KEYBOARD_HIL
          This driver implements support for HIL-keyboards attached
          to your machine, so normally you should say Y here.
 
+config KEYBOARD_HP6XX
+       tristate "HP Jornada 6XX Keyboard support"
+       depends on SH_HP6XX
+       select INPUT_POLLDEV
+       help
+         This adds support for the onboard keyboard found on
+         HP Jornada 620/660/680/690.
+
+         To compile this driver as a module, choose M here: the
+         module will be called jornada680_kbd.
+
+config KEYBOARD_HP7XX
+       tristate "HP Jornada 7XX Keyboard Driver"
+       depends on SA1100_JORNADA720_SSP && SA1100_SSP
+       help
+         Say Y here to add support for the HP Jornada 7xx (710/720/728)
+         onboard keyboard.
+
+         To compile this driver as a module, choose M here: the
+         module will be called jornada720_kbd.
+
 config KEYBOARD_OMAP
        tristate "TI OMAP keypad support"
        depends on (ARCH_OMAP1 || ARCH_OMAP2)
@@ -237,6 +258,12 @@ config OMAP_PS2
          To compile this driver as a module, choose M here: the
          module will be called innovator_ps2.
 
+config KEYBOARD_TSC2301
+       tristate "TSC2301 keypad support"
+       depends on SPI_TSC2301
+       help
+         Say Y here for if you are using the keypad features of TSC2301.
+
 config KEYBOARD_PXA27x
        tristate "PXA27x keyboard support"
        depends on PXA27x
@@ -273,10 +300,23 @@ config KEYBOARD_GPIO
          To compile this driver as a module, choose M here: the
          module will be called gpio-keys.
 
-config KEYBOARD_TSC2301
-       tristate "TSC2301 keypad support"
-       depends on SPI_TSC2301
+config KEYBOARD_MAPLE
+       tristate "Maple bus keyboard"
+       depends on SH_DREAMCAST && MAPLE
        help
-         Say Y here for if you are using the keypad features of TSC2301.
+         Say Y here if you have a Dreamcast console running Linux and have
+         a keyboard attached to its Maple bus.
+
+         To compile this driver as a module, choose M here: the
+         module will be called maple_keyb.
+
+config KEYBOARD_BFIN
+       tristate "Blackfin BF54x keypad support"
+       depends on BF54x
+       help
+         Say Y here if you want to use the BF54x keypad.
+
+         To compile this driver as a module, choose M here: the
+         module will be called bf54x-keys.
 
 endif