Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2...

[powerpc.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index c62e00c..049f2f5 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -166,7 +166,7 @@ config KEYBOARD_AMIGA
 
 config KEYBOARD_HIL_OLD
        tristate "HP HIL keyboard support (simple driver)"
-       depends on GSC
+       depends on GSC || HP300
        default y
        help
          The "Human Interface Loop" is a older, 8-channel USB-like
@@ -177,13 +177,13 @@ config KEYBOARD_HIL_OLD
          However, it has been thoroughly tested and is stable.
 
          If you want full HIL support including support for multiple
-         keyboards, mices and tablets, you have to enable the
+         keyboards, mice, and tablets, you have to enable the
          "HP System Device Controller i8042 Support" in the input/serio
          submenu.
 
 config KEYBOARD_HIL
        tristate "HP HIL keyboard support"
-       depends on GSC
+       depends on GSC || HP300
        default y
        select HP_SDC
        select HIL_MLC
@@ -203,4 +203,15 @@ config KEYBOARD_OMAP
          To compile this driver as a module, choose M here: the
          module will be called omap-keypad.
 
+config KEYBOARD_AAED2000
+       tristate "AAED-2000 keyboard"
+       depends on MACH_AAED2000
+       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.
+
 endif