Skip to content

Commit

Permalink
[ARM] pxa/tosa: move CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES to mach/Kc…
Browse files Browse the repository at this point in the history
…onfig

Tosa is now able to use generic matrix keypad driver instead of the deprecated
tosakbd.c, where CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES is still useful.  Move
it to mach/Kconfig.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
  • Loading branch information
Eric Miao committed May 11, 2010
1 parent cb432b3 commit cb8f3c7
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
12 changes: 12 additions & 0 deletions arch/arm/mach-pxa/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,18 @@ config TOSA_BT
This is a simple driver that is able to control
the state of built in bluetooth chip on tosa.

config TOSA_USE_EXT_KEYCODES
bool "Tosa keyboard: use extended keycodes"
depends on MACH_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 PXA_HAVE_BOARD_IRQS
bool

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/include/mach/tosa.h
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@

#define TOSA_KEY_SYNC KEY_102ND /* ??? */

#ifndef CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES
#ifndef CONFIG_TOSA_USE_EXT_KEYCODES
#define TOSA_KEY_RECORD KEY_YEN
#define TOSA_KEY_ADDRESSBOOK KEY_KATAKANA
#define TOSA_KEY_CANCEL KEY_ESC
Expand Down
10 changes: 0 additions & 10 deletions drivers/input/keyboard/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -426,16 +426,6 @@ config KEYBOARD_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
Expand Down

0 comments on commit cb8f3c7

Please sign in to comment.