diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-11-19 05:28:03 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-11-19 05:28:03 -0500 |
| commit | 9316e58076f47bd242c3700d6f4aa1563fdb7192 (patch) | |
| tree | 2dbb37ff5186cf5c43da555893bb579ca3739863 /drivers/hid/hid-ids.h | |
| parent | 9f323b681139d99beb456aff08cf339b29f3c78d (diff) | |
Revert "HID: wiimote: add LEGO-wiimote VID"
This reverts commit 86b84167d4e67372376a57ea9955c5d53dae232f as it introduced a
VID/PID conflict with its original owner: hid-wiimote got
hid:b0005g*v0000054Cp00000306 added but hid-sony already has this id for the
PS3 Remote (and the ID is oficically assigned to Sony).
Revert the commit to avoid hid-sony regression. David is working on a
bluez patch to force proper ID on the wiimote.
Reported-by: David Herrmann <dh.herrmann@gmail.com>
Reported-by: Michel Kraus <mksolpa@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 76559629568c..60336f06874c 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -640,7 +640,6 @@ | |||
| 640 | #define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN 0x0003 | 640 | #define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN 0x0003 |
| 641 | 641 | ||
| 642 | #define USB_VENDOR_ID_NINTENDO 0x057e | 642 | #define USB_VENDOR_ID_NINTENDO 0x057e |
| 643 | #define USB_VENDOR_ID_NINTENDO2 0x054c | ||
| 644 | #define USB_DEVICE_ID_NINTENDO_WIIMOTE 0x0306 | 643 | #define USB_DEVICE_ID_NINTENDO_WIIMOTE 0x0306 |
| 645 | #define USB_DEVICE_ID_NINTENDO_WIIMOTE2 0x0330 | 644 | #define USB_DEVICE_ID_NINTENDO_WIIMOTE2 0x0330 |
| 646 | 645 | ||