Skip to content

Commit

Permalink
Input: remove obsolete {corgi,spitz,tosa}kbd.c
Browse files Browse the repository at this point in the history
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Eric Miao authored and Dmitry Torokhov committed May 4, 2010
1 parent f319209 commit 16b32e0
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 1,403 deletions.
11 changes: 0 additions & 11 deletions Documentation/feature-removal-schedule.txt
Original file line number Diff line number Diff line change
Expand Up @@ -520,17 +520,6 @@ Who: Hans de Goede <hdegoede@redhat.com>

----------------------------

What: corgikbd, spitzkbd, tosakbd driver
When: 2.6.35
Files: drivers/input/keyboard/{corgi,spitz,tosa}kbd.c
Why: We now have a generic GPIO based matrix keyboard driver that
are fully capable of handling all the keys on these devices.
The original drivers manipulate the GPIO registers directly
and so are difficult to maintain.
Who: Eric Miao <eric.y.miao@gmail.com>

----------------------------

What: corgi_ssp and corgi_ts driver
When: 2.6.35
Files: arch/arm/mach-pxa/corgi_ssp.c, drivers/input/touchscreen/corgi_ts.c
Expand Down
48 changes: 0 additions & 48 deletions drivers/input/keyboard/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -143,19 +143,6 @@ config KEYBOARD_BFIN
To compile this driver as a module, choose M here: the
module will be called bf54x-keys.

config KEYBOARD_CORGI
tristate "Corgi keyboard (deprecated)"
depends on PXA_SHARPSL
help
Say Y here to enable the keyboard on the Sharp Zaurus SL-C7xx
series of PDAs.

This driver is now deprecated, use generic GPIO based matrix
keyboard driver instead.

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

config KEYBOARD_LKKBD
tristate "DECstation/VAXstation LK201/LK401 keyboard"
select SERIO
Expand Down Expand Up @@ -339,19 +326,6 @@ config KEYBOARD_PXA930_ROTARY
To compile this driver as a module, choose M here: the
module will be called pxa930_rotary.

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

This driver is now deprecated, use generic GPIO based matrix
keyboard driver instead.

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

config KEYBOARD_STOWAWAY
tristate "Stowaway keyboard"
select SERIO
Expand Down Expand Up @@ -414,28 +388,6 @@ config KEYBOARD_TWL4030
To compile this driver as a module, choose M here: the
module will be called twl4030_keypad.

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

This driver is now deprecated, use generic GPIO based matrix
keyboard driver instead.

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
Expand Down
3 changes: 0 additions & 3 deletions drivers/input/keyboard/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ 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_DAVINCI) += davinci_keyscan.o
obj-$(CONFIG_KEYBOARD_EP93XX) += ep93xx_keypad.o
obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o
Expand All @@ -33,10 +32,8 @@ 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
obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o
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
Loading

0 comments on commit 16b32e0

Please sign in to comment.