[Gc-linux-cvs] linux/drivers/input/keyboard Kconfig, 1.9, 1.10 Makefile, 1.6, 1.7

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

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

Modified Files:
	Kconfig Makefile 
Log Message:
Merge v2.6.29-rc6.

NOTE: Some of the Kconfig options and Makefile entries for the drivers
marked as "broken" will disappear with this commit.



Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile	14 Sep 2008 19:20:28 -0000	1.6
--- Makefile	2 Mar 2009 19:26:37 -0000	1.7
***************
*** 21,24 ****
--- 21,25 ----
  obj-$(CONFIG_KEYBOARD_OMAP)		+= omap-keypad.o
  obj-$(CONFIG_KEYBOARD_PXA27x)		+= pxa27x_keypad.o
+ obj-$(CONFIG_KEYBOARD_PXA930_ROTARY)	+= pxa930_rotary.o
  obj-$(CONFIG_KEYBOARD_AAED2000)		+= aaed2000_kbd.o
  obj-$(CONFIG_KEYBOARD_GPIO)		+= gpio_keys.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Kconfig,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Kconfig	1 Feb 2009 18:29:35 -0000	1.9
--- Kconfig	2 Mar 2009 19:26:37 -0000	1.10
***************
*** 269,272 ****
--- 269,281 ----
  	  module will be called pxa27x_keypad.
  
+ config KEYBOARD_PXA930_ROTARY
+ 	tristate "PXA930/PXA935 Enhanced Rotary Controller Support"
+ 	depends on CPU_PXA930 || CPU_PXA935
+ 	help
+ 	  Enable support for PXA930/PXA935 Enhanced Rotary Controller.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called pxa930_rotary.
+ 
  config KEYBOARD_AAED2000
  	tristate "AAED-2000 keyboard"