[Gc-linux-cvs] linux/drivers/input/keyboard Kconfig, 1.14, 1.15 Makefile, 1.10, 1.11

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 ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/input/keyboard

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

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile	25 Oct 2009 18:53:45 -0000	1.10
--- Makefile	25 Oct 2009 18:56:56 -0000	1.11
***************
*** 5,30 ****
  # Each configuration option enables a list of files.

! obj-$(CONFIG_KEYBOARD_ATKBD)		+= atkbd.o
! obj-$(CONFIG_KEYBOARD_SUNKBD)		+= sunkbd.o
! obj-$(CONFIG_KEYBOARD_LKKBD)		+= lkkbd.o
! obj-$(CONFIG_KEYBOARD_XTKBD)		+= xtkbd.o
  obj-$(CONFIG_KEYBOARD_AMIGA)		+= amikbd.o
  obj-$(CONFIG_KEYBOARD_ATARI)		+= atakbd.o
! obj-$(CONFIG_KEYBOARD_LOCOMO)		+= locomokbd.o
! obj-$(CONFIG_KEYBOARD_NEWTON)		+= newtonkbd.o
! obj-$(CONFIG_KEYBOARD_STOWAWAY)		+= stowaway.o
  obj-$(CONFIG_KEYBOARD_CORGI)		+= corgikbd.o
! obj-$(CONFIG_KEYBOARD_SPITZ)		+= spitzkbd.o
! obj-$(CONFIG_KEYBOARD_TOSA)		+= tosakbd.o
  obj-$(CONFIG_KEYBOARD_HIL)		+= hil_kbd.o
  obj-$(CONFIG_KEYBOARD_HIL_OLD)		+= hilkbd.o
- 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
  obj-$(CONFIG_KEYBOARD_HP6XX)		+= jornada680_kbd.o
  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
--- 5,33 ----
  # Each configuration option enables a list of files.

! obj-$(CONFIG_KEYBOARD_AAED2000)		+= aaed2000_kbd.o
  obj-$(CONFIG_KEYBOARD_AMIGA)		+= amikbd.o
  obj-$(CONFIG_KEYBOARD_ATARI)		+= atakbd.o
! obj-$(CONFIG_KEYBOARD_ATKBD)		+= atkbd.o
! obj-$(CONFIG_KEYBOARD_BFIN)		+= bf54x-keys.o
  obj-$(CONFIG_KEYBOARD_CORGI)		+= corgikbd.o
! obj-$(CONFIG_KEYBOARD_EP93XX)		+= ep93xx_keypad.o
! obj-$(CONFIG_KEYBOARD_GPIO)		+= gpio_keys.o
  obj-$(CONFIG_KEYBOARD_HIL)		+= hil_kbd.o
  obj-$(CONFIG_KEYBOARD_HIL_OLD)		+= hilkbd.o
  obj-$(CONFIG_KEYBOARD_HP6XX)		+= jornada680_kbd.o
  obj-$(CONFIG_KEYBOARD_HP7XX)		+= jornada720_kbd.o
+ obj-$(CONFIG_KEYBOARD_LKKBD)		+= lkkbd.o
+ obj-$(CONFIG_KEYBOARD_LM8323)		+= lm8323.o
+ obj-$(CONFIG_KEYBOARD_LOCOMO)		+= locomokbd.o
  obj-$(CONFIG_KEYBOARD_MAPLE)		+= maple_keyb.o
! obj-$(CONFIG_KEYBOARD_MATRIX)		+= matrix_keypad.o
! obj-$(CONFIG_KEYBOARD_NEWTON)		+= newtonkbd.o
! 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_SH_KEYSC)		+= sh_keysc.o
+ obj-$(CONFIG_KEYBOARD_SPITZ)		+= spitzkbd.o
+ obj-$(CONFIG_KEYBOARD_STOWAWAY)		+= stowaway.o
+ obj-$(CONFIG_KEYBOARD_SUNKBD)		+= sunkbd.o
+ obj-$(CONFIG_KEYBOARD_TOSA)		+= tosakbd.o
+ obj-$(CONFIG_KEYBOARD_XTKBD)		+= xtkbd.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Kconfig,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Kconfig	25 Oct 2009 18:53:45 -0000	1.14
--- Kconfig	25 Oct 2009 18:56:56 -0000	1.15
***************
*** 13,16 ****
--- 13,52 ----
  if INPUT_KEYBOARD

+ config KEYBOARD_AAED2000
+ 	tristate "AAED-2000 keyboard"
+ 	depends on MACH_AAED2000
+ 	select INPUT_POLLDEV
+ 	default y
+ 	help
+ 	  Say Y here to enable the keyboard on the Agilent AAED-2000
+ 	  development board.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called aaed2000_kbd.
+ 
+ config KEYBOARD_AMIGA
+ 	tristate "Amiga keyboard"
+ 	depends on AMIGA
+ 	help
+ 	  Say Y here if you are running Linux on any AMIGA and have a keyboard
+ 	  attached.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called amikbd.
+ 
+ config ATARI_KBD_CORE
+ 	bool
+ 
+ config KEYBOARD_ATARI
+ 	tristate "Atari keyboard"
+ 	depends on ATARI
+ 	select ATARI_KBD_CORE
+ 	help
+ 	  Say Y here if you are running Linux on any Atari and have a keyboard
+ 	  attached.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called atakbd.
+ 
  config KEYBOARD_ATKBD
  	tristate "AT keyboard" if EMBEDDED || !X86
***************
*** 69,135 ****
  	  left-hand column.

! config KEYBOARD_SUNKBD
! 	tristate "Sun Type 4 and Type 5 keyboard"
! 	select SERIO
! 	help
! 	  Say Y here if you want to use a Sun Type 4 or Type 5 keyboard,
! 	  connected either to the Sun keyboard connector or to an serial
! 	  (RS-232) port via a simple adapter.
! 
! 	  To compile this driver as a module, choose M here: the
! 	  module will be called sunkbd.
! 
! config KEYBOARD_LKKBD
! 	tristate "DECstation/VAXstation LK201/LK401 keyboard"
! 	select SERIO
! 	help
! 	  Say Y here if you want to use a LK201 or LK401 style serial
! 	  keyboard. This keyboard is also useable on PCs if you attach
! 	  it with the inputattach program. The connector pinout is
! 	  described within lkkbd.c.
! 
! 	  To compile this driver as a module, choose M here: the
! 	  module will be called lkkbd.
! 
! config KEYBOARD_LOCOMO
! 	tristate "LoCoMo Keyboard Support"
! 	depends on SHARP_LOCOMO && INPUT_KEYBOARD
! 	help
! 	  Say Y here if you are running Linux on a Sharp Zaurus Collie or Poodle based PDA
! 
! 	  To compile this driver as a module, choose M here: the
! 	  module will be called locomokbd.
! 
! config KEYBOARD_XTKBD
! 	tristate "XT keyboard"
! 	select SERIO
! 	help
! 	  Say Y here if you want to use the old IBM PC/XT keyboard (or
! 	  compatible) on your system. This is only possible with a
! 	  parallel port keyboard adapter, you cannot connect it to the
! 	  keyboard port on a PC that runs Linux.
! 
! 	  To compile this driver as a module, choose M here: the
! 	  module will be called xtkbd.
! 
! config KEYBOARD_NEWTON
! 	tristate "Newton keyboard"
! 	select SERIO
! 	help
! 	  Say Y here if you have a Newton keyboard on a serial port.
! 
! 	  To compile this driver as a module, choose M here: the
! 	  module will be called newtonkbd.
! 
! config KEYBOARD_STOWAWAY
! 	tristate "Stowaway keyboard"
! 	select SERIO
  	help
! 	  Say Y here if you have a Stowaway keyboard on a serial port.
! 	  Stowaway compatible keyboards like Dicota Input-PDA keyboard
! 	  are also supported by this driver.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called stowaway.

  config KEYBOARD_CORGI
--- 105,116 ----
  	  left-hand column.

! config KEYBOARD_BFIN
! 	tristate "Blackfin BF54x keypad support"
! 	depends on (BF54x && !BF544)
  	help
! 	  Say Y here if you want to use the BF54x keypad.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called bf54x-keys.

  config KEYBOARD_CORGI
***************
*** 144,202 ****
  	  module will be called corgikbd.

! config KEYBOARD_SPITZ
! 	tristate "Spitz keyboard"
! 	depends on PXA_SHARPSL
! 	default y
  	help
! 	  Say Y here to enable the keyboard on the Sharp Zaurus SL-C1000,
! 	  SL-C3000 and Sl-C3100 series of PDAs.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called spitzkbd.

! config KEYBOARD_TOSA
! 	tristate "Tosa keyboard"
! 	depends on MACH_TOSA
! 	default y
  	help
! 	  Say Y here to enable the keyboard on the Sharp Zaurus SL-6000x (Tosa)

  	  To compile this driver as a module, choose M here: the
! 	  module will be called tosakbd.

! config KEYBOARD_TOSA_USE_EXT_KEYCODES
! 	bool "Tosa keyboard: use extended keycodes"
! 	depends on KEYBOARD_TOSA
! 	default n
  	help
! 	  Say Y here to enable the tosa keyboard driver to generate extended
! 	  (>= 127) keycodes. Be aware, that they can't be correctly interpreted
! 	  by either console keyboard driver or by Kdrive keybd driver.
! 
! 	  Say Y only if you know, what you are doing!

! config KEYBOARD_AMIGA
! 	tristate "Amiga keyboard"
! 	depends on AMIGA
! 	help
! 	  Say Y here if you are running Linux on any AMIGA and have a keyboard
! 	  attached.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called amikbd.
! 
! config ATARI_KBD_CORE
! 	bool

! config KEYBOARD_ATARI
! 	tristate "Atari keyboard"
! 	depends on ATARI
! 	select ATARI_KBD_CORE
  	help
! 	  Say Y here if you are running Linux on any Atari and have a keyboard
! 	  attached.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called atakbd.

  config KEYBOARD_HIL_OLD
--- 125,172 ----
  	  module will be called corgikbd.

! config KEYBOARD_LKKBD
! 	tristate "DECstation/VAXstation LK201/LK401 keyboard"
! 	select SERIO
  	help
! 	  Say Y here if you want to use a LK201 or LK401 style serial
! 	  keyboard. This keyboard is also useable on PCs if you attach
! 	  it with the inputattach program. The connector pinout is
! 	  described within lkkbd.c.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called lkkbd.

! config KEYBOARD_EP93XX
! 	tristate "EP93xx Matrix Keypad support"
! 	depends on ARCH_EP93XX
  	help
! 	  Say Y here to enable the matrix keypad on the Cirrus EP93XX.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called ep93xx_keypad.

! config KEYBOARD_GPIO
! 	tristate "GPIO Buttons"
! 	depends on GENERIC_GPIO
  	help
! 	  This driver implements support for buttons connected
! 	  to GPIO pins of various CPUs (and some other chips).

! 	  Say Y here if your device has buttons connected
! 	  directly to such GPIO pins.  Your board-specific
! 	  setup logic must also provide a platform device,
! 	  with configuration data saying which GPIOs are used.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called gpio_keys.

! config KEYBOARD_MATRIX
! 	tristate "GPIO driven matrix keypad support"
! 	depends on GENERIC_GPIO
  	help
! 	  Enable support for GPIO driven matrix keypad.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called matrix_keypad.

  config KEYBOARD_HIL_OLD
***************
*** 251,262 ****
  	  module will be called jornada720_kbd.

! config KEYBOARD_OMAP
! 	tristate "TI OMAP keypad support"
! 	depends on (ARCH_OMAP1 || ARCH_OMAP2)
  	help
! 	  Say Y here if you want to use the OMAP keypad.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called omap-keypad.

  config KEYBOARD_PXA27x
--- 221,262 ----
  	  module will be called jornada720_kbd.

! config KEYBOARD_LM8323
! 	tristate "LM8323 keypad chip"
! 	depends on I2C
! 	depends on LEDS_CLASS
  	help
! 	  If you say yes here you get support for the National Semiconductor
! 	  LM8323 keypad controller.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called lm8323.
! 
! config KEYBOARD_LOCOMO
! 	tristate "LoCoMo Keyboard Support"
! 	depends on SHARP_LOCOMO
! 	help
! 	  Say Y here if you are running Linux on a Sharp Zaurus Collie or Poodle based PDA
! 
! 	  To compile this driver as a module, choose M here: the
! 	  module will be called locomokbd.
! 
! config KEYBOARD_MAPLE
! 	tristate "Maple bus keyboard"
! 	depends on SH_DREAMCAST && MAPLE
! 	help
! 	  Say Y here if you have a Dreamcast console running Linux and have
! 	  a keyboard attached to its Maple bus.
! 
! 	  To compile this driver as a module, choose M here: the
! 	  module will be called maple_keyb.
! 
! config KEYBOARD_NEWTON
! 	tristate "Newton keyboard"
! 	select SERIO
! 	help
! 	  Say Y here if you have a Newton keyboard on a serial port.
! 
! 	  To compile this driver as a module, choose M here: the
! 	  module will be called newtonkbd.

  config KEYBOARD_PXA27x
***************
*** 264,268 ****
  	depends on PXA27x || PXA3xx
  	help
! 	  Enable support for PXA27x/PXA3xx keypad controller

  	  To compile this driver as a module, choose M here: the
--- 264,268 ----
  	depends on PXA27x || PXA3xx
  	help
! 	  Enable support for PXA27x/PXA3xx keypad controller.

  	  To compile this driver as a module, choose M here: the
***************
*** 278,326 ****
  	  module will be called pxa930_rotary.

! config KEYBOARD_AAED2000
! 	tristate "AAED-2000 keyboard"
! 	depends on MACH_AAED2000
! 	select INPUT_POLLDEV
  	default y
  	help
! 	  Say Y here to enable the keyboard on the Agilent AAED-2000
! 	  development board.
! 
! 	  To compile this driver as a module, choose M here: the
! 	  module will be called aaed2000_kbd.
! 
! config KEYBOARD_GPIO
! 	tristate "GPIO Buttons"
! 	depends on GENERIC_GPIO
! 	help
! 	  This driver implements support for buttons connected
! 	  to GPIO pins of various CPUs (and some other chips).
! 
! 	  Say Y here if your device has buttons connected
! 	  directly to such GPIO pins.  Your board-specific
! 	  setup logic must also provide a platform device,
! 	  with configuration data saying which GPIOs are used.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called gpio-keys.

! config KEYBOARD_MAPLE
! 	tristate "Maple bus keyboard"
! 	depends on SH_DREAMCAST && MAPLE
  	help
! 	  Say Y here if you have a Dreamcast console running Linux and have
! 	  a keyboard attached to its Maple bus.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called maple_keyb.

! config KEYBOARD_BFIN
! 	tristate "Blackfin BF54x keypad support"
! 	depends on (BF54x && !BF544)
  	help
! 	  Say Y here if you want to use the BF54x keypad.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called bf54x-keys.

  config KEYBOARD_SH_KEYSC
--- 278,313 ----
  	  module will be called pxa930_rotary.

! config KEYBOARD_SPITZ
! 	tristate "Spitz keyboard"
! 	depends on PXA_SHARPSL
  	default y
  	help
! 	  Say Y here to enable the keyboard on the Sharp Zaurus SL-C1000,
! 	  SL-C3000 and Sl-C3100 series of PDAs.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called spitzkbd.

! config KEYBOARD_STOWAWAY
! 	tristate "Stowaway keyboard"
! 	select SERIO
  	help
! 	  Say Y here if you have a Stowaway keyboard on a serial port.
! 	  Stowaway compatible keyboards like Dicota Input-PDA keyboard
! 	  are also supported by this driver.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called stowaway.

! config KEYBOARD_SUNKBD
! 	tristate "Sun Type 4 and Type 5 keyboard"
! 	select SERIO
  	help
! 	  Say Y here if you want to use a Sun Type 4 or Type 5 keyboard,
! 	  connected either to the Sun keyboard connector or to an serial
! 	  (RS-232) port via a simple adapter.

  	  To compile this driver as a module, choose M here: the
! 	  module will be called sunkbd.

  config KEYBOARD_SH_KEYSC
***************
*** 333,335 ****
--- 320,364 ----
  	  To compile this driver as a module, choose M here: the
  	  module will be called sh_keysc.
+ 
+ config KEYBOARD_OMAP
+ 	tristate "TI OMAP keypad support"
+ 	depends on (ARCH_OMAP1 || ARCH_OMAP2)
+ 	help
+ 	  Say Y here if you want to use the OMAP keypad.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called omap-keypad.
+ 
+ config KEYBOARD_TOSA
+ 	tristate "Tosa keyboard"
+ 	depends on MACH_TOSA
+ 	default y
+ 	help
+ 	  Say Y here to enable the keyboard on the Sharp Zaurus SL-6000x (Tosa)
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called tosakbd.
+ 
+ config KEYBOARD_TOSA_USE_EXT_KEYCODES
+ 	bool "Tosa keyboard: use extended keycodes"
+ 	depends on KEYBOARD_TOSA
+ 	help
+ 	  Say Y here to enable the tosa keyboard driver to generate extended
+ 	  (>= 127) keycodes. Be aware, that they can't be correctly interpreted
+ 	  by either console keyboard driver or by Kdrive keybd driver.
+ 
+ 	  Say Y only if you know, what you are doing!
+ 
+ config KEYBOARD_XTKBD
+ 	tristate "XT keyboard"
+ 	select SERIO
+ 	help
+ 	  Say Y here if you want to use the old IBM PC/XT keyboard (or
+ 	  compatible) on your system. This is only possible with a
+ 	  parallel port keyboard adapter, you cannot connect it to the
+ 	  keyboard port on a PC that runs Linux.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called xtkbd.
+ 
  endif