diff options
| -rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-wiimote-core.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 512b01c04ea7..eb0309eae7b9 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -1747,6 +1747,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
| 1747 | 1747 | ||
| 1748 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) }, | 1748 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) }, |
| 1749 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) }, | 1749 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) }, |
| 1750 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) }, | ||
| 1750 | { } | 1751 | { } |
| 1751 | }; | 1752 | }; |
| 1752 | 1753 | ||
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index c4388776f4e4..4905346b03f8 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -614,6 +614,7 @@ | |||
| 614 | 614 | ||
| 615 | #define USB_VENDOR_ID_NINTENDO 0x057e | 615 | #define USB_VENDOR_ID_NINTENDO 0x057e |
| 616 | #define USB_DEVICE_ID_NINTENDO_WIIMOTE 0x0306 | 616 | #define USB_DEVICE_ID_NINTENDO_WIIMOTE 0x0306 |
| 617 | #define USB_DEVICE_ID_NINTENDO_WIIMOTE2 0x0330 | ||
| 617 | 618 | ||
| 618 | #define USB_VENDOR_ID_NOVATEK 0x0603 | 619 | #define USB_VENDOR_ID_NOVATEK 0x0603 |
| 619 | #define USB_DEVICE_ID_NOVATEK_PCT 0x0600 | 620 | #define USB_DEVICE_ID_NOVATEK_PCT 0x0600 |
diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c index f1c7a113b614..f7b521aa1b3d 100644 --- a/drivers/hid/hid-wiimote-core.c +++ b/drivers/hid/hid-wiimote-core.c | |||
| @@ -1291,6 +1291,8 @@ static void wiimote_hid_remove(struct hid_device *hdev) | |||
| 1291 | static const struct hid_device_id wiimote_hid_devices[] = { | 1291 | static const struct hid_device_id wiimote_hid_devices[] = { |
| 1292 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, | 1292 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, |
| 1293 | USB_DEVICE_ID_NINTENDO_WIIMOTE) }, | 1293 | USB_DEVICE_ID_NINTENDO_WIIMOTE) }, |
| 1294 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, | ||
| 1295 | USB_DEVICE_ID_NINTENDO_WIIMOTE2) }, | ||
| 1294 | { } | 1296 | { } |
| 1295 | }; | 1297 | }; |
| 1296 | MODULE_DEVICE_TABLE(hid, wiimote_hid_devices); | 1298 | MODULE_DEVICE_TABLE(hid, wiimote_hid_devices); |
