[Gc-linux-cvs] linux/drivers/input/keyboard Kconfig, 1.15, 1.16 Makefile, 1.11, 1.12

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/input/keyboard
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/input/keyboard

Modified Files:
	Kconfig Makefile 
Log Message:
Merge gc-linux-v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile	25 Oct 2009 18:56:56 -0000	1.11
--- Makefile	25 Oct 2009 18:59:28 -0000	1.12
***************
*** 32,33 ****
--- 32,34 ----
  obj-$(CONFIG_KEYBOARD_TOSA)		+= tosakbd.o
  obj-$(CONFIG_KEYBOARD_XTKBD)		+= xtkbd.o
+ obj-$(CONFIG_KEYBOARD_WII)		+= rvl-stkbd.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Kconfig,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.15
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.16
***************
*** 311,314 ****
--- 311,325 ----
  	  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"