diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-10-02 15:06:27 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-10-02 15:06:27 +0200 |
| commit | 05109c8f5d6566c76f9c14603447ecbc3346ebef (patch) | |
| tree | 04c4357e746cd116818f76a5b687822e92cac367 /drivers/hid | |
| parent | ff9b00a226ccea66e6ce70e9083c42f5b6001f73 (diff) | |
| parent | 947a6bdda1e5f9572097157b2741522706cc35c6 (diff) | |
Merge branch 'upstream' into for-next
Diffstat (limited to 'drivers/hid')
| -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 7d05c4bb201e..9d66d535fad5 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1620,6 +1620,7 @@ static const struct hid_device_id hid_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO) }, { HID_USB_DEVICE(USB_VENDOR_ID_KWORLD, USB_DEVICE_ID_KWORLD_RADIO_FM700) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_KYE, 0x0058) }, { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY) }, { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY) }, { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY) }, |