Sync with mainline: drivers/input/keyboard

KEYBOARD_OMAP is now in mainline kernel.

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 519c8c9687b14385f270b78bf7d65fb41b09c23e..4b8d219b6f7fcff57bf2b8ed4019a81cbd5359eb 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -121,6 +121,17 @@ config KEYBOARD_NEWTON
          To compile this driver as a module, choose M here: the
          module will be called newtonkbd.
 
+config KEYBOARD_STOWAWAY
+       tristate "Stowaway keyboard"
+       select SERIO
+       help
+         Say Y here if you have a Stowaway keyboard on a serial port.
+         Stowaway compatible keyboards like Dicota Input-PDA keyboard
+         are also supported by this driver.
+
+         To compile this driver as a module, choose M here: the
+         module will be called stowaway.
+
 config KEYBOARD_CORGI
        tristate "Corgi keyboard"
        depends on PXA_SHARPSL
@@ -155,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
@@ -166,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
@@ -183,7 +194,6 @@ config KEYBOARD_HIL
          This driver implements support for HIL-keyboards attached
          to your machine, so normally you should say Y here.
 
-
 config KEYBOARD_OMAP
        tristate "TI OMAP keypad support"
        depends on (ARCH_OMAP1 || ARCH_OMAP2)

diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 545268a62e8f6ebb586a110b3d4adc90bf852bb9..963845a26ef2ac653d1fc9b637e6be25dae0f542 100644 (file)
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_KEYBOARD_XTKBD)          += xtkbd.o
 obj-$(CONFIG_KEYBOARD_AMIGA)           += amikbd.o
 obj-$(CONFIG_KEYBOARD_LOCOMO)          += locomokbd.o
 obj-$(CONFIG_KEYBOARD_NEWTON)          += newtonkbd.o
+obj-$(CONFIG_KEYBOARD_STOWAWAY)                += stowaway.o
 obj-$(CONFIG_KEYBOARD_CORGI)           += corgikbd.o
 obj-$(CONFIG_KEYBOARD_SPITZ)           += spitzkbd.o
 obj-$(CONFIG_KEYBOARD_HIL)             += hil_kbd.o