diff options
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
-rw-r--r-- | drivers/hid/hid-lg.c | 2 | ||||
-rw-r--r-- | drivers/hid/hid-lgff.c | 3 |
4 files changed, 7 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index b1986b954ac5..852989fc5757 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1405,6 +1405,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1405 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) }, | 1405 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) }, |
1406 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFP_WHEEL) }, | 1406 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFP_WHEEL) }, |
1407 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) }, | 1407 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) }, |
1408 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G27_WHEEL) }, | ||
1408 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WII_WHEEL) }, | 1409 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WII_WHEEL) }, |
1409 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) }, | 1410 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) }, |
1410 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACETRAVELLER) }, | 1411 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACETRAVELLER) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 087a5a436598..e41d32a43962 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -394,6 +394,7 @@ | |||
394 | #define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL 0xc295 | 394 | #define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL 0xc295 |
395 | #define USB_DEVICE_ID_LOGITECH_DFP_WHEEL 0xc298 | 395 | #define USB_DEVICE_ID_LOGITECH_DFP_WHEEL 0xc298 |
396 | #define USB_DEVICE_ID_LOGITECH_G25_WHEEL 0xc299 | 396 | #define USB_DEVICE_ID_LOGITECH_G25_WHEEL 0xc299 |
397 | #define USB_DEVICE_ID_LOGITECH_G27_WHEEL 0xc29b | ||
397 | #define USB_DEVICE_ID_LOGITECH_WII_WHEEL 0xc29c | 398 | #define USB_DEVICE_ID_LOGITECH_WII_WHEEL 0xc29c |
398 | #define USB_DEVICE_ID_LOGITECH_ELITE_KBD 0xc30a | 399 | #define USB_DEVICE_ID_LOGITECH_ELITE_KBD 0xc30a |
399 | #define USB_DEVICE_ID_S510_RECEIVER 0xc50c | 400 | #define USB_DEVICE_ID_S510_RECEIVER 0xc50c |
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c index 3da90402ee81..21f205f09250 100644 --- a/drivers/hid/hid-lg.c +++ b/drivers/hid/hid-lg.c | |||
@@ -377,6 +377,8 @@ static const struct hid_device_id lg_devices[] = { | |||
377 | .driver_data = LG_FF }, | 377 | .driver_data = LG_FF }, |
378 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL), | 378 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL), |
379 | .driver_data = LG_FF }, | 379 | .driver_data = LG_FF }, |
380 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G27_WHEEL), | ||
381 | .driver_data = LG_FF }, | ||
380 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFP_WHEEL), | 382 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFP_WHEEL), |
381 | .driver_data = LG_FF }, | 383 | .driver_data = LG_FF }, |
382 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WII_WHEEL), | 384 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WII_WHEEL), |
diff --git a/drivers/hid/hid-lgff.c b/drivers/hid/hid-lgff.c index 90d0ef2c92be..f901349c30b5 100644 --- a/drivers/hid/hid-lgff.c +++ b/drivers/hid/hid-lgff.c | |||
@@ -72,6 +72,9 @@ static const struct dev_type devices[] = { | |||
72 | { 0x046d, 0xc287, ff_joystick_ac }, | 72 | { 0x046d, 0xc287, ff_joystick_ac }, |
73 | { 0x046d, 0xc293, ff_joystick }, | 73 | { 0x046d, 0xc293, ff_joystick }, |
74 | { 0x046d, 0xc294, ff_wheel }, | 74 | { 0x046d, 0xc294, ff_wheel }, |
75 | { 0x046d, 0xc298, ff_wheel }, | ||
76 | { 0x046d, 0xc299, ff_wheel }, | ||
77 | { 0x046d, 0xc29b, ff_wheel }, | ||
75 | { 0x046d, 0xc295, ff_joystick }, | 78 | { 0x046d, 0xc295, ff_joystick }, |
76 | { 0x046d, 0xca03, ff_wheel }, | 79 | { 0x046d, 0xca03, ff_wheel }, |
77 | }; | 80 | }; |