diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-03-22 17:04:14 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-03-22 17:04:14 -0400 |
| commit | 31c46e0c23e3c423b81a13a4d0c60d26ae50120f (patch) | |
| tree | 47876ac7280fc1608abdc04977e2b82b6e8f5a78 /add-appleir-usb-driver.patch | |
| parent | c0fad2331547d5377ec05af374c81bc4385a00cb (diff) | |
| download | kernel-31c46e0c23e3c423b81a13a4d0c60d26ae50120f.tar.gz kernel-31c46e0c23e3c423b81a13a4d0c60d26ae50120f.tar.xz kernel-31c46e0c23e3c423b81a13a4d0c60d26ae50120f.zip | |
update to 2.6.38-git11
Diffstat (limited to 'add-appleir-usb-driver.patch')
| -rw-r--r-- | add-appleir-usb-driver.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/add-appleir-usb-driver.patch b/add-appleir-usb-driver.patch index 61edb8061..af4f968f6 100644 --- a/add-appleir-usb-driver.patch +++ b/add-appleir-usb-driver.patch @@ -99,9 +99,9 @@ index baa25ad..abc5bd7 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1244,8 +1244,6 @@ static const struct hid_device_id hid_blacklist[] = { - #if defined(CONFIG_HID_ACRUX_FF) || defined(CONFIG_HID_ACRUX_FF_MODULE) + { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) }, + { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) }, { 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) }, |