diff options
| author | AceLan Kao <acelan.kao@canonical.com> | 2013-11-27 10:05:56 +0800 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-12-02 15:10:03 +0100 |
| commit | 765e5fbd3e04ba753b2585e9f852fdcd34b95d10 (patch) | |
| tree | 10aeab42affbe048df71607d8cb5c19e78a7a265 /drivers/hid/hid-ids.h | |
| parent | 9fee8240cfd37081c88e2d84852c497ba18baeac (diff) | |
| download | linux-765e5fbd3e04ba753b2585e9f852fdcd34b95d10.tar.gz linux-765e5fbd3e04ba753b2585e9f852fdcd34b95d10.tar.bz2 linux-765e5fbd3e04ba753b2585e9f852fdcd34b95d10.zip | |
HID: usbhid: merge the sis quirk
USB_VENDOR_ID_SIS and USB_VENDOR_ID_SIS2_TOUCH are identical,
so refine the code and merge the quirks.
Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 76559629568c..90e9806e864b 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -755,9 +755,10 @@ #define USB_VENDOR_ID_SIGMATEL 0x066F #define USB_DEVICE_ID_SIGMATEL_STMP3780 0x3780 -#define USB_VENDOR_ID_SIS2_TOUCH 0x0457 +#define USB_VENDOR_ID_SIS_TOUCH 0x0457 #define USB_DEVICE_ID_SIS9200_TOUCH 0x9200 #define USB_DEVICE_ID_SIS817_TOUCH 0x0817 +#define USB_DEVICE_ID_SIS_TS 0x1013 #define USB_VENDOR_ID_SKYCABLE 0x1223 #define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07 @@ -936,7 +937,5 @@ #define USB_VENDOR_ID_PRIMAX 0x0461 #define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05 -#define USB_VENDOR_ID_SIS 0x0457 -#define USB_DEVICE_ID_SIS_TS 0x1013 #endif |