Merge branch 'topic/hda' into for-linus

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

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 086d58c0ccbe0ef2d800df377df2593af13cfb46..35561689ff38717f60ddc588493d7d02206f2008 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -154,6 +154,27 @@ config KEYBOARD_SPITZ
          To compile this driver as a module, choose M here: the
          module will be called spitzkbd.
 
+config KEYBOARD_TOSA
+       tristate "Tosa keyboard"
+       depends on MACH_TOSA
+       default y
+       help
+         Say Y here to enable the keyboard on the Sharp Zaurus SL-6000x (Tosa)
+
+         To compile this driver as a module, choose M here: the
+         module will be called tosakbd.
+
+config KEYBOARD_TOSA_USE_EXT_KEYCODES
+       bool "Tosa keyboard: use extended keycodes"
+       depends on KEYBOARD_TOSA
+       default n
+       help
+         Say Y here to enable the tosa keyboard driver to generate extended
+         (>= 127) keycodes. Be aware, that they can't be correctly interpreted
+         by either console keyboard driver or by Kdrive keybd driver.
+
+         Say Y only if you know, what you are doing!
+
 config KEYBOARD_AMIGA
        tristate "Amiga keyboard"
        depends on AMIGA
@@ -239,13 +260,22 @@ config KEYBOARD_OMAP
          module will be called omap-keypad.
 
 config KEYBOARD_PXA27x
-       tristate "PXA27x keyboard support"
-       depends on PXA27x
+       tristate "PXA27x/PXA3xx keypad support"
+       depends on PXA27x || PXA3xx
+       help
+         Enable support for PXA27x/PXA3xx keypad controller
+
+         To compile this driver as a module, choose M here: the
+         module will be called pxa27x_keypad.
+
+config KEYBOARD_PXA930_ROTARY
+       tristate "PXA930/PXA935 Enhanced Rotary Controller Support"
+       depends on CPU_PXA930 || CPU_PXA935
        help
-         Enable support for PXA27x matrix keyboard controller
+         Enable support for PXA930/PXA935 Enhanced Rotary Controller.
 
          To compile this driver as a module, choose M here: the
-         module will be called pxa27x_keyboard.
+         module will be called pxa930_rotary.
 
 config KEYBOARD_AAED2000
        tristate "AAED-2000 keyboard"
@@ -293,4 +323,13 @@ config KEYBOARD_BFIN
          To compile this driver as a module, choose M here: the
          module will be called bf54x-keys.
 
+config KEYBOARD_SH_KEYSC
+       tristate "SuperH KEYSC keypad support"
+       depends on SUPERH
+       help
+         Say Y here if you want to use a keypad attached to the KEYSC block
+         on SuperH processors such as sh7722 and sh7343.
+
+         To compile this driver as a module, choose M here: the
+         module will be called sh_keysc.
 endif