Update of /cvsroot/gc-linux/linux/drivers/input/keyboard
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13650/drivers/input/keyboard
Modified Files:
Kconfig Makefile
Log Message:
Merged 2.6.25.
Queued small fixes for:
- starlet-es
- starlet-ipc
- starlet-stm
- rvl-stsd
- rvl-sthcd
- gcn-ai
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 12 Apr 2008 17:34:03 -0000 1.4
+++ Makefile 13 Sep 2008 19:42:56 -0000 1.5
@@ -15,10 +15,11 @@
obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o
obj-$(CONFIG_KEYBOARD_CORGI) += corgikbd.o
obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o
+obj-$(CONFIG_KEYBOARD_TOSA) += tosakbd.o
obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o
obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o
obj-$(CONFIG_KEYBOARD_OMAP) += omap-keypad.o
-obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keyboard.o
+obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keypad.o
obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o
obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o
obj-$(CONFIG_KEYBOARD_HP6XX) += jornada680_kbd.o
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Kconfig,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Kconfig 2 Jul 2008 20:45:36 -0000 1.6
+++ Kconfig 13 Sep 2008 19:42:56 -0000 1.7
@@ -154,6 +154,27 @@
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,13 @@
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 matrix keyboard controller
+ Enable support for PXA27x/PXA3xx keypad controller
To compile this driver as a module, choose M here: the
- module will be called pxa27x_keyboard.
+ module will be called pxa27x_keypad.
config KEYBOARD_AAED2000
tristate "AAED-2000 keyboard"
|
