Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[karo-tx-linux.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index bd707b86c114a9b7fa323a46b51ccb15fd410b9f..086d58c0ccbe0ef2d800df377df2593af13cfb46 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -164,6 +164,9 @@ config KEYBOARD_AMIGA
          To compile this driver as a module, choose M here: the
          module will be called amikbd.
 
+config ATARI_KBD_CORE
+       bool
+
 config KEYBOARD_ATARI
        tristate "Atari keyboard"
        depends on ATARI
@@ -205,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"
+       depends on SH_HP6XX
+       select INPUT_POLLDEV
+       help
+         Say Y here if you have a HP Jornada 620/660/680/690 and want to
+         support the built-in keyboard.
+
+         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"
+       depends on SA1100_JORNADA720_SSP && SA1100_SSP
+       help
+         Say Y here if you have a HP Jornada 710/720/728 and want to
+         support the built-in 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)
@@ -250,4 +274,23 @@ config KEYBOARD_GPIO
          To compile this driver as a module, choose M here: the
          module will be called gpio-keys.
 
+config KEYBOARD_MAPLE
+       tristate "Maple bus keyboard"
+       depends on SH_DREAMCAST && MAPLE
+       help
+         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 && !BF544)
+       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