summaryrefslogtreecommitdiffstats
path: root/add-appleir-usb-driver.patch
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2011-05-30 07:23:14 -0400
committerKyle McMartin <kyle@redhat.com>2011-05-30 07:23:14 -0400
commit123d535ad8de98fe5fd368bea098100171fdfb97 (patch)
tree519e4e355539a65ca27c0321f3af048874314d4d /add-appleir-usb-driver.patch
parentcbc61c988b303e7718d0e711e1c506b0700042f4 (diff)
downloadkernel-123d535ad8de98fe5fd368bea098100171fdfb97.tar.gz
kernel-123d535ad8de98fe5fd368bea098100171fdfb97.tar.xz
kernel-123d535ad8de98fe5fd368bea098100171fdfb97.zip
rebase and nuke patches
Diffstat (limited to 'add-appleir-usb-driver.patch')
-rw-r--r--add-appleir-usb-driver.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/add-appleir-usb-driver.patch b/add-appleir-usb-driver.patch
index af4f968f6..26477ccce 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[] = {
- { 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) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ACTIONSTAR, USB_DEVICE_ID_ACTIONSTAR_1011) },
- { 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) },