[Gc-linux-cvs] linux/drivers/input/keyboard Kconfig, 1.7, 1.8 Makefile, 1.5, 1.6

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

Update of /cvsroot/gc-linux/linux/drivers/input/keyboard
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4241/drivers/input/keyboard

Modified Files:
	Kconfig Makefile 
Log Message:
Merge 2.6.26.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	13 Sep 2008 19:42:56 -0000	1.5
+++ Makefile	14 Sep 2008 19:20:28 -0000	1.6
@@ -26,4 +26,5 @@
 obj-$(CONFIG_KEYBOARD_HP7XX)		+= jornada720_kbd.o
 obj-$(CONFIG_KEYBOARD_MAPLE)		+= maple_keyb.o
 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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Kconfig	13 Sep 2008 19:42:56 -0000	1.7
+++ Kconfig	14 Sep 2008 19:20:28 -0000	1.8
@@ -321,8 +321,17 @@
 	  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"
+	depends on SUPERH
+	help
+	  Say Y here if you want to use a keypad attached to the KEYSC block
+	  on SuperH processors such as sh7722 and sh7343.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called sh_keysc.
 endif