git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
input
/
keyboard
/
Kconfig
diff --git
a/drivers/input/keyboard/Kconfig
b/drivers/input/keyboard/Kconfig
index
e55dee3
..
a9dda56
100644
(file)
--- a/
drivers/input/keyboard/Kconfig
+++ b/
drivers/input/keyboard/Kconfig
@@
-13,11
+13,11
@@
menuconfig INPUT_KEYBOARD
if INPUT_KEYBOARD
config KEYBOARD_ATKBD
if INPUT_KEYBOARD
config KEYBOARD_ATKBD
- tristate "AT keyboard" if
!
PC
+ tristate "AT keyboard" if
EMBEDDED || !X86_
PC
default y
select SERIO
select SERIO_LIBPS2
default y
select SERIO
select SERIO_LIBPS2
- select SERIO_I8042 if PC
+ select SERIO_I8042 if
X86_
PC
select SERIO_GSCPS2 if GSC
help
Say Y here if you want to use a standard AT or PS/2 keyboard. Usually
select SERIO_GSCPS2 if GSC
help
Say Y here if you want to use a standard AT or PS/2 keyboard. Usually
@@
-93,7
+93,7
@@
config KEYBOARD_LKKBD
config KEYBOARD_LOCOMO
tristate "LoCoMo Keyboard Support"
config KEYBOARD_LOCOMO
tristate "LoCoMo Keyboard Support"
- depends on SHARP_LOCOMO
+ depends on SHARP_LOCOMO
&& INPUT_KEYBOARD
help
Say Y here if you are running Linux on a Sharp Zaurus Collie or Poodle based PDA
help
Say Y here if you are running Linux on a Sharp Zaurus Collie or Poodle based PDA
@@
-132,15
+132,16
@@
config KEYBOARD_CORGI
To compile this driver as a module, choose M here: the
module will be called corgikbd.
To compile this driver as a module, choose M here: the
module will be called corgikbd.
-config KEYBOARD_MAPLE
- tristate "Maple bus keyboard"
- depends on SH_DREAMCAST && MAPLE
+config KEYBOARD_SPITZ
+ tristate "Spitz keyboard"
+ depends on PXA_SHARPSL
+ default y
help
help
- Say Y here
if you have a DreamCast console running Linux and have
-
a keyboard attached to its Maple bu
s.
+ Say Y here
to enable the keyboard on the Sharp Zaurus SL-C1000,
+
SL-C3000 and Sl-C3100 series of PDA
s.
To compile this driver as a module, choose M here: the
To compile this driver as a module, choose M here: the
- module will be called
maple_keyb
.
+ module will be called
spitzkbd
.
config KEYBOARD_AMIGA
tristate "Amiga keyboard"
config KEYBOARD_AMIGA
tristate "Amiga keyboard"