diff options
-rw-r--r-- | drivers/hid/hid-core.c | 5 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 60ea284407ce..15ffc0aaf178 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1550,6 +1550,10 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1550 | { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, | 1550 | { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, |
1551 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK, USB_DEVICE_ID_HOLTEK_ON_LINE_GRIP) }, | 1551 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK, USB_DEVICE_ID_HOLTEK_ON_LINE_GRIP) }, |
1552 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) }, | 1552 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) }, |
1553 | { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086, USB_DEVICE_ID_SENSOR_HUB_1020) }, | ||
1554 | { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086, USB_DEVICE_ID_SENSOR_HUB_09FA) }, | ||
1555 | { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087, USB_DEVICE_ID_SENSOR_HUB_1020) }, | ||
1556 | { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087, USB_DEVICE_ID_SENSOR_HUB_09FA) }, | ||
1553 | { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, | 1557 | { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, |
1554 | { HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) }, | 1558 | { HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) }, |
1555 | { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, | 1559 | { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, |
@@ -1642,6 +1646,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1642 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, | 1646 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, |
1643 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, | 1647 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, |
1644 | { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) }, | 1648 | { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) }, |
1649 | { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM, USB_DEVICE_ID_SENSOR_HUB_7014) }, | ||
1645 | { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) }, | 1650 | { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) }, |
1646 | { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) }, | 1651 | { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) }, |
1647 | { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323) }, | 1652 | { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 1dcb76ff51e3..8a270a38cfa1 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -419,6 +419,11 @@ | |||
419 | #define USB_VENDOR_ID_IMATION 0x0718 | 419 | #define USB_VENDOR_ID_IMATION 0x0718 |
420 | #define USB_DEVICE_ID_DISC_STAKKA 0xd000 | 420 | #define USB_DEVICE_ID_DISC_STAKKA 0xd000 |
421 | 421 | ||
422 | #define USB_VENDOR_ID_INTEL_8086 0x8086 | ||
423 | #define USB_VENDOR_ID_INTEL_8087 0x8087 | ||
424 | #define USB_DEVICE_ID_SENSOR_HUB_1020 0x1020 | ||
425 | #define USB_DEVICE_ID_SENSOR_HUB_09FA 0x09FA | ||
426 | |||
422 | #define USB_VENDOR_ID_IRTOUCHSYSTEMS 0x6615 | 427 | #define USB_VENDOR_ID_IRTOUCHSYSTEMS 0x6615 |
423 | #define USB_DEVICE_ID_IRTOUCH_INFRARED_USB 0x0070 | 428 | #define USB_DEVICE_ID_IRTOUCH_INFRARED_USB 0x0070 |
424 | 429 | ||
@@ -695,6 +700,7 @@ | |||
695 | 700 | ||
696 | #define USB_VENDOR_ID_STANTUM_STM 0x0483 | 701 | #define USB_VENDOR_ID_STANTUM_STM 0x0483 |
697 | #define USB_DEVICE_ID_MTP_STM 0x3261 | 702 | #define USB_DEVICE_ID_MTP_STM 0x3261 |
703 | #define USB_DEVICE_ID_SENSOR_HUB_7014 0x7014 | ||
698 | 704 | ||
699 | #define USB_VENDOR_ID_STANTUM_SITRONIX 0x1403 | 705 | #define USB_VENDOR_ID_STANTUM_SITRONIX 0x1403 |
700 | #define USB_DEVICE_ID_MTP_SITRONIX 0x5001 | 706 | #define USB_DEVICE_ID_MTP_SITRONIX 0x5001 |