summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-ids.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-04-30 10:19:21 +0200
committerJiri Kosina <jkosina@suse.cz>2013-04-30 10:19:21 +0200
commitad1b890e06af049fb48d7ccb799d0e96c071c893 (patch)
treed52f8e173cfaaf9e71fe4bb46259b3a3bb513088 /drivers/hid/hid-ids.h
parent047dff63f913c21c5228b94118e7996ab998cdc4 (diff)
parent2d44e3d26891e9530e29395f5a86b751c2f69ee8 (diff)
downloadblackbird-op-linux-ad1b890e06af049fb48d7ccb799d0e96c071c893.tar.gz
blackbird-op-linux-ad1b890e06af049fb48d7ccb799d0e96c071c893.zip
Merge branches 'for-3.10/wiimote' and 'for-3.9/upstream-fixes' into for-linus
Diffstat (limited to 'drivers/hid/hid-ids.h')
-rw-r--r--drivers/hid/hid-ids.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 61bea32b6ab5..38535c9243d5 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -617,6 +617,7 @@
#define USB_VENDOR_ID_NINTENDO 0x057e
#define USB_DEVICE_ID_NINTENDO_WIIMOTE 0x0306
+#define USB_DEVICE_ID_NINTENDO_WIIMOTE2 0x0330
#define USB_VENDOR_ID_NOVATEK 0x0603
#define USB_DEVICE_ID_NOVATEK_PCT 0x0600
OpenPOWER on IntegriCloud