[Gc-linux-cvs] linux/drivers/input/keyboard Kconfig, 1.12, 1.13 Makefile, 1.8, 1.9 rvl-stkbd.c, 1.3, 1.4

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

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

Modified Files:
	Kconfig Makefile rvl-stkbd.c 
Log Message:
Merge gc-linux-v2.6.30.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	25 Oct 2009 18:33:47 -0000	1.8
--- Makefile	25 Oct 2009 18:50:27 -0000	1.9
***************
*** 29,30 ****
--- 29,31 ----
  obj-$(CONFIG_KEYBOARD_BFIN)		+= bf54x-keys.o
  obj-$(CONFIG_KEYBOARD_SH_KEYSC)		+= sh_keysc.o
+ obj-$(CONFIG_KEYBOARD_WII)		+= rvl-stkbd.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Kconfig,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Kconfig	25 Oct 2009 18:45:35 -0000	1.12
--- Kconfig	25 Oct 2009 18:50:27 -0000	1.13
***************
*** 324,327 ****
--- 324,338 ----
  	  module will be called bf54x-keys.
  
+ 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"

Index: rvl-stkbd.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/rvl-stkbd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rvl-stkbd.c	1 Feb 2009 18:29:35 -0000	1.3
--- rvl-stkbd.c	25 Oct 2009 18:50:27 -0000	1.4
***************
*** 29,33 ****
  #include <linux/module.h>
  #include <linux/of_platform.h>
! #include <asm/starlet.h>
  
  #define DRV_MODULE_NAME  "rvl-stkbd"
--- 29,33 ----
  #include <linux/module.h>
  #include <linux/of_platform.h>
! #include <asm/starlet-ios.h>
  
  #define DRV_MODULE_NAME  "rvl-stkbd"
***************
*** 35,39 ****
  #define DRV_AUTHOR       "Albert Herranz"
  
! static char stkbd_driver_version[] = "0.1i";
  
  #define drv_printk(level, format, arg...) \
--- 35,39 ----
  #define DRV_AUTHOR       "Albert Herranz"
  
! static char stkbd_driver_version[] = "0.2i";
  
  #define drv_printk(level, format, arg...) \
***************
*** 471,475 ****
  
  static struct of_device_id stkbd_of_match[] = {
! 	{ .compatible = "nintendo,starlet-keyboard" },
  	{ },
  };
--- 471,475 ----
  
  static struct of_device_id stkbd_of_match[] = {
! 	{ .compatible = "nintendo,starlet-ios-keyboard" },
  	{ },
  };