[Gc-linux-cvs] linux/drivers/input/keyboard Kconfig, 1.17, 1.18 Makefile, 1.13, 1.14

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/gc-linux/linux/drivers/input/keyboard
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/drivers/input/keyboard

Modified Files:
	Kconfig Makefile 
Log Message:
Forward to v2.6.32.

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile	9 Dec 2009 18:18:07 -0000	1.13
--- Makefile	9 Dec 2009 18:40:09 -0000	1.14
***************
*** 6,9 ****
--- 6,10 ----

  obj-$(CONFIG_KEYBOARD_AAED2000)		+= aaed2000_kbd.o
+ obj-$(CONFIG_KEYBOARD_ADP5588)		+= adp5588-keys.o
  obj-$(CONFIG_KEYBOARD_AMIGA)		+= amikbd.o
  obj-$(CONFIG_KEYBOARD_ATARI)		+= atakbd.o
***************
*** 22,29 ****
--- 23,33 ----
  obj-$(CONFIG_KEYBOARD_MAPLE)		+= maple_keyb.o
  obj-$(CONFIG_KEYBOARD_MATRIX)		+= matrix_keypad.o
+ obj-$(CONFIG_KEYBOARD_MAX7359)		+= max7359_keypad.o
  obj-$(CONFIG_KEYBOARD_NEWTON)		+= newtonkbd.o
  obj-$(CONFIG_KEYBOARD_OMAP)		+= omap-keypad.o
+ obj-$(CONFIG_KEYBOARD_OPENCORES)	+= opencores-kbd.o
  obj-$(CONFIG_KEYBOARD_PXA27x)		+= pxa27x_keypad.o
  obj-$(CONFIG_KEYBOARD_PXA930_ROTARY)	+= pxa930_rotary.o
+ obj-$(CONFIG_KEYBOARD_QT2160)		+= qt2160.o
  obj-$(CONFIG_KEYBOARD_SH_KEYSC)		+= sh_keysc.o
  obj-$(CONFIG_KEYBOARD_SPITZ)		+= spitzkbd.o
***************
*** 31,33 ****
--- 35,39 ----
  obj-$(CONFIG_KEYBOARD_SUNKBD)		+= sunkbd.o
  obj-$(CONFIG_KEYBOARD_TOSA)		+= tosakbd.o
+ obj-$(CONFIG_KEYBOARD_TWL4030)		+= twl4030_keypad.o
  obj-$(CONFIG_KEYBOARD_XTKBD)		+= xtkbd.o
+ obj-$(CONFIG_KEYBOARD_W90P910)		+= w90p910_keypad.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Kconfig,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Kconfig	9 Dec 2009 18:18:07 -0000	1.17
--- Kconfig	9 Dec 2009 18:40:09 -0000	1.18
***************
*** 25,28 ****
--- 25,38 ----
  	  module will be called aaed2000_kbd.

+ config KEYBOARD_ADP5588
+ 	tristate "ADP5588 I2C QWERTY Keypad and IO Expander"
+ 	depends on I2C
+ 	help
+ 	  Say Y here if you want to use a ADP5588 attached to your
+ 	  system I2C bus.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called adp5588-keys.
+ 
  config KEYBOARD_AMIGA
  	tristate "Amiga keyboard"
***************
*** 105,108 ****
--- 115,128 ----
  	  left-hand column.

+ config QT2160
+ 	tristate "Atmel AT42QT2160 Touch Sensor Chip"
+ 	depends on I2C && EXPERIMENTAL
+ 	help
+ 	  If you say yes here you get support for Atmel AT42QT2160 Touch
+ 	  Sensor chip as a keyboard input.
+ 
+ 	  This driver can also be built as a module. If so, the module
+ 	  will be called qt2160.
+ 
  config KEYBOARD_BFIN
  	tristate "Blackfin BF54x keypad support"
***************
*** 188,192 ****

  config KEYBOARD_HIL
! 	tristate "HP HIL keyboard support"
  	depends on GSC || HP300
  	default y
--- 208,212 ----

  config KEYBOARD_HIL
! 	tristate "HP HIL keyboard/pointer support"
  	depends on GSC || HP300
  	default y
***************
*** 197,201 ****
  	  The "Human Interface Loop" is a older, 8-channel USB-like
  	  controller used in several Hewlett Packard models.
! 	  This driver implements support for HIL-keyboards attached
  	  to your machine, so normally you should say Y here.

--- 217,222 ----
  	  The "Human Interface Loop" is a older, 8-channel USB-like
  	  controller used in several Hewlett Packard models.
! 	  This driver implements support for HIL-keyboards and pointing
! 	  devices (mice, tablets, touchscreens) attached
  	  to your machine, so normally you should say Y here.

***************
*** 251,254 ****
--- 272,286 ----
  	  module will be called maple_keyb.

+ config KEYBOARD_MAX7359
+ 	tristate "Maxim MAX7359 Key Switch Controller"
+ 	depends on I2C
+ 	help
+ 	  If you say yes here you get support for the Maxim MAX7359 Key
+ 	  Switch Controller chip. This providers microprocessors with
+ 	  management of up to 64 key switches
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called max7359_keypad.
+ 
  config KEYBOARD_NEWTON
  	tristate "Newton keyboard"
***************
*** 260,263 ****
--- 292,304 ----
  	  module will be called newtonkbd.

+ config KEYBOARD_OPENCORES
+ 	tristate "OpenCores Keyboard Controller"
+ 	help
+ 	  Say Y here if you want to use the OpenCores Keyboard Controller
+ 	  http://www.opencores.org/project,keyboardcontroller
+ 
+ 	  To compile this driver as a module, choose M here; the
+ 	  module will be called opencores-kbd.
+ 
  config KEYBOARD_PXA27x
  	tristate "PXA27x/PXA3xx keypad support"
***************
*** 330,333 ****
--- 371,385 ----
  	  module will be called omap-keypad.

+ config KEYBOARD_TWL4030
+ 	tristate "TI TWL4030/TWL5030/TPS659x0 keypad support"
+ 	depends on TWL4030_CORE
+ 	help
+ 	  Say Y here if your board use the keypad controller on
+ 	  TWL4030 family chips.  It's safe to say enable this
+ 	  even on boards that don't use the keypad controller.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called twl4030_keypad.
+ 
  config KEYBOARD_TOSA
  	tristate "Tosa keyboard"
***************
*** 362,364 ****
--- 414,426 ----
  	  module will be called xtkbd.

+ config KEYBOARD_W90P910
+ 	tristate "W90P910 Matrix Keypad support"
+ 	depends on ARCH_W90X900
+ 	help
+ 	  Say Y here to enable the matrix keypad on evaluation board
+ 	  based on W90P910.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called w90p910_keypad.
+ 
  endif