From: Albert H. <he...@us...> - 2009-12-09 18:45:04
|
Update of /cvsroot/gc-linux/linux/drivers/input/keyboard In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/drivers/input/keyboard Modified Files: Kconfig Makefile Log Message: Merge v2.6.32. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile 9 Dec 2009 18:40:09 -0000 1.14 --- Makefile 9 Dec 2009 18:44:55 -0000 1.15 *************** *** 38,39 **** --- 38,40 ---- obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o obj-$(CONFIG_KEYBOARD_W90P910) += w90p910_keypad.o + obj-$(CONFIG_KEYBOARD_WII) += rvl-stkbd.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Kconfig,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Kconfig 9 Dec 2009 18:40:09 -0000 1.18 --- Kconfig 9 Dec 2009 18:44:55 -0000 1.19 *************** *** 352,355 **** --- 352,366 ---- module will be called sunkbd. + config KEYBOARD_WII + tristate "Nintendo Wii USB keyboard IOS glue" + depends on (STARLET_IOS && !USB) + help + Say Y here if you have a Nintendo Wii console running Linux and have + a keyboard attached to one of its USB ports. + This driver uses the IOS interface glue to access the USB keyboard. + + To compile this driver as a module, choose M here: the + module will be called rvl-stkbd. + config KEYBOARD_SH_KEYSC tristate "SuperH KEYSC keypad support" |