aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/joystick/Kconfig2
-rw-r--r--drivers/input/keyboard/Kconfig2
-rw-r--r--drivers/input/serio/Kconfig4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 67519ef0ef95..271263443c37 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -32,7 +32,7 @@ config JOYSTICK_ANALOG
32 module will be called analog. 32 module will be called analog.
33 33
34config JOYSTICK_A3D 34config JOYSTICK_A3D
35 tristate "Assasin 3D and MadCatz Panther devices" 35 tristate "Assassin 3D and MadCatz Panther devices"
36 select GAMEPORT 36 select GAMEPORT
37 help 37 help
38 Say Y here if you have an FPGaming or MadCatz controller using the 38 Say Y here if you have an FPGaming or MadCatz controller using the
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index c62e00c79dec..679bde34d247 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -177,7 +177,7 @@ config KEYBOARD_HIL_OLD
177 However, it has been thoroughly tested and is stable. 177 However, it has been thoroughly tested and is stable.
178 178
179 If you want full HIL support including support for multiple 179 If you want full HIL support including support for multiple
180 keyboards, mices and tablets, you have to enable the 180 keyboards, mice, and tablets, you have to enable the
181 "HP System Device Controller i8042 Support" in the input/serio 181 "HP System Device Controller i8042 Support" in the input/serio
182 submenu. 182 submenu.
183 183
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 98acf170252c..8cdbfeca5903 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -115,9 +115,9 @@ config HP_SDC
115 depends on GSC && SERIO 115 depends on GSC && SERIO
116 default y 116 default y
117 ---help--- 117 ---help---
118 This option enables supports for the the "System Device 118 This option enables support for the "System Device
119 Controller", an i8042 carrying microcode to manage a 119 Controller", an i8042 carrying microcode to manage a
120 few miscellanous devices on some Hewlett Packard systems. 120 few miscellaneous devices on some Hewlett Packard systems.
121 The SDC itself contains a 10ms resolution timer/clock capable 121 The SDC itself contains a 10ms resolution timer/clock capable
122 of delivering interrupts on a periodic and one-shot basis. 122 of delivering interrupts on a periodic and one-shot basis.
123 The SDC may also be connected to a battery-backed real-time 123 The SDC may also be connected to a battery-backed real-time