Merge branches 'for-3.18/always-poll-quirk', 'for-3.18/logitech', 'for-3.18/picolcd...
[sfrench/cifs-2.6.git] / drivers / hid / hid-ids.h
index 29e9b4872ebd982d203c3f8a008eb69454492ed3..cd9c9e96cf0ef838618a95438afa0794f82b1eb5 100644 (file)
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_73F7      0x73f7
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001      0xa001
 
+#define USB_VENDOR_ID_ELAN             0x04f3
+#define USB_DEVICE_ID_ELAN_TOUCHSCREEN 0x0089
+
 #define USB_VENDOR_ID_ELECOM           0x056e
 #define USB_DEVICE_ID_ELECOM_BM084     0x0061
 
 #define USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL 0xff
 
 #define USB_VENDOR_ID_PIXART                           0x093a
+#define USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE_ID2     0x0137
+#define USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE         0x2510
 #define USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN      0x8001
 #define USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1     0x8002
 #define USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2     0x8003