commit ada8c7973b65865cf0436b73898e32992860012a
author Jiri Kosina <jkosina@suse.cz> Wed Aug 04 15:31:13 2010 +0200
committer Jiri Kosina <jkosina@suse.cz> Wed Aug 04 15:31:13 2010 +0200
tree dad7fb8494a0e4ea4734ed1d25c876205c6701c3
parent 35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd
parent 7d876c05fa6cf82f0274f27276d981ed325697a5
parent 0b3fa399bef02f3658295f8dd334fc26a59c3a95
parent 70c7c9c4438fc3ca573744c5448df90dbcc5e159

Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linus

Conflicts:
	drivers/hid/hid-ids.h

drivers/hid/hid-ids.h

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 08b6ac6..fa053ab 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -439,6 +439,9 @@
 #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 +536,4 @@
 #define USB_VENDOR_ID_ZYDACRON	0x13EC
 #define USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL	0x0006
 
-
 #endif