aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorAlexander Holler <holler@ahsoftware.de>2012-12-08 20:12:24 -0500
committerJiri Kosina <jkosina@suse.cz>2012-12-12 10:49:10 -0500
commit68fd32b8228a62ca7f46ed64da8267daad29480b (patch)
treeb9771f46c09413967e06a8914e745a36053c000c /drivers/hid
parent83499b52c61f50292f0aae36499de8a8fc3e37c3 (diff)
Revert "HID: sensors: add to special driver list"
Those IDs aren't necessary anymore. This reverts commit c8147d9ea19bfe7d8e569351bc7239e118dd6997. Signed-off-by: Alexander Holler <holler@ahsoftware.de> Acked-by: "Pandruvada, Srinivas" <srinivas.pandruvada@intel.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-core.c5
-rw-r--r--drivers/hid/hid-ids.h6
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 7df5399a9386..c96e548cd7b8 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1580,10 +1580,6 @@ static const struct hid_device_id hid_have_special_driver[] = {
1580 { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, 1580 { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) },
1581 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK, USB_DEVICE_ID_HOLTEK_ON_LINE_GRIP) }, 1581 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK, USB_DEVICE_ID_HOLTEK_ON_LINE_GRIP) },
1582 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) }, 1582 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) },
1583 { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086, USB_DEVICE_ID_SENSOR_HUB_1020) },
1584 { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086, USB_DEVICE_ID_SENSOR_HUB_09FA) },
1585 { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087, USB_DEVICE_ID_SENSOR_HUB_1020) },
1586 { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087, USB_DEVICE_ID_SENSOR_HUB_09FA) },
1587 { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, 1583 { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },
1588 { HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) }, 1584 { HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) },
1589 { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, 1585 { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },
@@ -1681,7 +1677,6 @@ static const struct hid_device_id hid_have_special_driver[] = {
1681 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, 1677 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
1682 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, 1678 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
1683 { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) }, 1679 { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
1684 { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM, USB_DEVICE_ID_SENSOR_HUB_7014) },
1685 { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) }, 1680 { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
1686 { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) }, 1681 { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },
1687 { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323) }, 1682 { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 9d7a42857ea1..8fd25d387af1 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -432,11 +432,6 @@
432#define USB_VENDOR_ID_IMATION 0x0718 432#define USB_VENDOR_ID_IMATION 0x0718
433#define USB_DEVICE_ID_DISC_STAKKA 0xd000 433#define USB_DEVICE_ID_DISC_STAKKA 0xd000
434 434
435#define USB_VENDOR_ID_INTEL_8086 0x8086
436#define USB_VENDOR_ID_INTEL_8087 0x8087
437#define USB_DEVICE_ID_SENSOR_HUB_1020 0x1020
438#define USB_DEVICE_ID_SENSOR_HUB_09FA 0x09FA
439
440#define USB_VENDOR_ID_IRTOUCHSYSTEMS 0x6615 435#define USB_VENDOR_ID_IRTOUCHSYSTEMS 0x6615
441#define USB_DEVICE_ID_IRTOUCH_INFRARED_USB 0x0070 436#define USB_DEVICE_ID_IRTOUCH_INFRARED_USB 0x0070
442 437
@@ -714,7 +709,6 @@
714 709
715#define USB_VENDOR_ID_STANTUM_STM 0x0483 710#define USB_VENDOR_ID_STANTUM_STM 0x0483
716#define USB_DEVICE_ID_MTP_STM 0x3261 711#define USB_DEVICE_ID_MTP_STM 0x3261
717#define USB_DEVICE_ID_SENSOR_HUB_7014 0x7014
718 712
719#define USB_VENDOR_ID_STANTUM_SITRONIX 0x1403 713#define USB_VENDOR_ID_STANTUM_SITRONIX 0x1403
720#define USB_DEVICE_ID_MTP_SITRONIX 0x5001 714#define USB_DEVICE_ID_MTP_SITRONIX 0x5001