diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-01 12:02:10 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-01 12:02:10 -0500 |
| commit | ef0eaa13362041f531f951b89362bfbc177e2bc0 (patch) | |
| tree | e2d43099698aa238f9d108c67451871b0d4073f9 /drivers/input/keyboard/Kconfig | |
| parent | 53b2ec5518aa2623e8c0cb36f1c304a797988a46 (diff) | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/input/keyboard/Kconfig')
| -rw-r--r-- | drivers/input/keyboard/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 571a68691a4a..4a917748fd9f 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig | |||
| @@ -13,11 +13,11 @@ menuconfig INPUT_KEYBOARD | |||
| 13 | if INPUT_KEYBOARD | 13 | if INPUT_KEYBOARD |
| 14 | 14 | ||
| 15 | config KEYBOARD_ATKBD | 15 | config KEYBOARD_ATKBD |
| 16 | tristate "AT keyboard" if !PC | 16 | tristate "AT keyboard" if !X86_PC |
| 17 | default y | 17 | default y |
| 18 | select SERIO | 18 | select SERIO |
| 19 | select SERIO_LIBPS2 | 19 | select SERIO_LIBPS2 |
| 20 | select SERIO_I8042 if PC | 20 | select SERIO_I8042 if X86_PC |
| 21 | select SERIO_GSCPS2 if GSC | 21 | select SERIO_GSCPS2 if GSC |
| 22 | help | 22 | help |
| 23 | Say Y here if you want to use a standard AT or PS/2 keyboard. Usually | 23 | Say Y here if you want to use a standard AT or PS/2 keyboard. Usually |