diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:29:35 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:29:35 +0200 |
| commit | 35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd (patch) | |
| tree | 1f85aa8bd902aae76beb1c9deb20557a2e71fe9c /drivers/hid/hid-core.c | |
| parent | 9929ffed889b4861b52ba648a44fa4add945c4d1 (diff) | |
| parent | 7d3d42a79519df4cd62c3aa5d9ae2d77ebbf8fab (diff) | |
Merge branch 'acrux' into for-linus
Conflicts:
drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/hid-core.c')
| -rw-r--r-- | drivers/hid/hid-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index be7ee330e48..e13d8033a84 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1239,6 +1239,9 @@ static const struct hid_device_id hid_blacklist[] = { { HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M2256) }, { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) }, { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) }, +#if defined(CONFIG_HID_ACRUX_FF) || defined(CONFIG_HID_ACRUX_FF_MODULE) + { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) }, +#endif { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) }, |