diff options
-rw-r--r-- | drivers/hid/Kconfig | 15 | ||||
-rw-r--r-- | drivers/hid/Makefile | 2 | ||||
-rw-r--r-- | drivers/hid/hid-lg.h | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 306b15f39c9c..6ae234f21453 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -278,13 +278,20 @@ config LOGIG940_FF | |||
278 | Say Y here if you want to enable force feedback support for Logitech | 278 | Say Y here if you want to enable force feedback support for Logitech |
279 | Flight System G940 devices. | 279 | Flight System G940 devices. |
280 | 280 | ||
281 | config LOGIWII_FF | 281 | config LOGIWHEELS_FF |
282 | bool "Logitech Speed Force Wireless force feedback support" | 282 | bool "Logitech wheels configuration and force feedback support" |
283 | depends on HID_LOGITECH | 283 | depends on HID_LOGITECH |
284 | select INPUT_FF_MEMLESS | 284 | select INPUT_FF_MEMLESS |
285 | help | 285 | help |
286 | Say Y here if you want to enable force feedback support for Logitech | 286 | Say Y here if you want to enable force feedback and range setting |
287 | Speed Force Wireless (Wii) devices. | 287 | support for following Logitech wheels: |
288 | - Logitech Driving Force | ||
289 | - Logitech Driving Force Pro | ||
290 | - Logitech Driving Force GT | ||
291 | - Logitech G25 | ||
292 | - Logitech G27 | ||
293 | - Logitech MOMO/MOMO 2 | ||
294 | - Logitech Formula Force EX | ||
288 | 295 | ||
289 | config HID_MAGICMOUSE | 296 | config HID_MAGICMOUSE |
290 | tristate "Apple MagicMouse multi-touch support" | 297 | tristate "Apple MagicMouse multi-touch support" |
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 0a0a38e9fd28..77c9e5d7ff97 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile | |||
@@ -21,7 +21,7 @@ endif | |||
21 | ifdef CONFIG_LOGIG940_FF | 21 | ifdef CONFIG_LOGIG940_FF |
22 | hid-logitech-y += hid-lg3ff.o | 22 | hid-logitech-y += hid-lg3ff.o |
23 | endif | 23 | endif |
24 | ifdef CONFIG_LOGIWII_FF | 24 | ifdef CONFIG_LOGIWHEELS_FF |
25 | hid-logitech-y += hid-lg4ff.o | 25 | hid-logitech-y += hid-lg4ff.o |
26 | endif | 26 | endif |
27 | 27 | ||
diff --git a/drivers/hid/hid-lg.h b/drivers/hid/hid-lg.h index 3a3295991ab3..4b097286dc78 100644 --- a/drivers/hid/hid-lg.h +++ b/drivers/hid/hid-lg.h | |||
@@ -19,7 +19,7 @@ int lg3ff_init(struct hid_device *hdev); | |||
19 | static inline int lg3ff_init(struct hid_device *hdev) { return -1; } | 19 | static inline int lg3ff_init(struct hid_device *hdev) { return -1; } |
20 | #endif | 20 | #endif |
21 | 21 | ||
22 | #ifdef CONFIG_LOGIWII_FF | 22 | #ifdef CONFIG_LOGIWHEELS_FF |
23 | int lg4ff_init(struct hid_device *hdev); | 23 | int lg4ff_init(struct hid_device *hdev); |
24 | int lg4ff_deinit(struct hid_device *hdev); | 24 | int lg4ff_deinit(struct hid_device *hdev); |
25 | #else | 25 | #else |