From: Jiri Kosina Date: Wed, 4 Aug 2010 13:31:13 +0000 (+0200) Subject: Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linus X-Git-Tag: v2.6.36-rc1~567^2~1 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ada8c7973b65865cf0436b73898e32992860012a;p=~shefty%2Frdma-dev.git Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linus Conflicts: drivers/hid/hid-ids.h --- ada8c7973b65865cf0436b73898e32992860012a diff --cc drivers/hid/hid-ids.h index 08b6ac6d2cc,6af77ed0b55,6af77ed0b55,d42c88fea90..fa053ab4d57 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@@@@ -401,26 -389,8 -389,8 -392,26 +401,26 @@@@@ #define USB_VENDOR_ID_NEXTWINDOW 0x1926 #define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN 0x0003 ---#define USB_VENDOR_ID_NTRIG 0x1b96 +++#define USB_VENDOR_ID_NTRIG 0x1b96 #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001 ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1 0x0003 ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2 0x0004 ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3 0x0005 ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4 0x0006 ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5 0x0007 ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6 0x0008 ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7 0x0009 ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8 0x000A ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9 0x000B ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10 0x000C ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11 0x000D ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12 0x000E ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13 0x000F ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14 0x0010 ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15 0x0011 ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16 0x0012 ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17 0x0013 ++ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18 0x0014 #define USB_VENDOR_ID_ONTRAK 0x0a07 #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064 @@@@@ -436,9 -406,9 -406,9 -427,9 +436,12 @@@@@ #define USB_VENDOR_ID_PETALYNX 0x18b1 #define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE 0x0037 ---#define USB_VENDOR_ID_PHILIPS 0x0471 +++#define USB_VENDOR_ID_PHILIPS 0x0471 #define USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE 0x0617 ++++#define USB_VENDOR_ID_PI_ENGINEERING 0x05f3 ++++#define USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL 0xff ++++ #define USB_VENDOR_ID_PLAYDOTCOM 0x0b43 #define USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII 0x0003 @@@@@ -533,5 -501,9 -501,9 -522,11 +536,4 @@@@@ #define USB_VENDOR_ID_ZYDACRON 0x13EC #define USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL 0x0006 ---#define USB_VENDOR_ID_KYE 0x0458 ---#define USB_DEVICE_ID_KYE_ERGO_525V 0x0087 ---#define USB_DEVICE_ID_KYE_GPEN_560 0x5003 --- -#define USB_VENDOR_ID_PI_ENGINEERING 0x05f3 -#define USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL 0xff ---- #endif