diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-04-30 10:19:21 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-04-30 10:19:21 +0200 |
| commit | ad1b890e06af049fb48d7ccb799d0e96c071c893 (patch) | |
| tree | d52f8e173cfaaf9e71fe4bb46259b3a3bb513088 /drivers/hid/hid-core.c | |
| parent | 047dff63f913c21c5228b94118e7996ab998cdc4 (diff) | |
| parent | 2d44e3d26891e9530e29395f5a86b751c2f69ee8 (diff) | |
| download | linux-ad1b890e06af049fb48d7ccb799d0e96c071c893.tar.gz linux-ad1b890e06af049fb48d7ccb799d0e96c071c893.tar.bz2 linux-ad1b890e06af049fb48d7ccb799d0e96c071c893.zip | |
Merge branches 'for-3.10/wiimote' and 'for-3.9/upstream-fixes' into for-linus
Diffstat (limited to 'drivers/hid/hid-core.c')
| -rw-r--r-- | drivers/hid/hid-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 98dd6ab9aa27..6961bbeab3ed 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1730,6 +1730,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) }, { } }; |