From 5ec9b58901ae15070cebc38be817542c92ac1c89 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Tue, 14 Oct 2008 22:45:40 +0200 Subject: [PATCH] --- yaml --- r: 114473 b: refs/heads/master c: df9bcace7b1c29e9be1c13b034ff04f4f4c90ede h: refs/heads/master i: 114471: 1621a64e8571746fd4c9a1d406fe5f482a1c0116 v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-core.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c34aa0011850..b7d725f50519 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a48c65b35a6f993aec13d18a37f6ea71fbcb0c06 +refs/heads/master: df9bcace7b1c29e9be1c13b034ff04f4f4c90ede diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c index 2cba490fcd51..8a7d9dbb4d07 100644 --- a/trunk/drivers/hid/hid-core.c +++ b/trunk/drivers/hid/hid-core.c @@ -1221,6 +1221,7 @@ EXPORT_SYMBOL_GPL(hid_connect); static const struct hid_device_id hid_blacklist[] = { { 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) }, + { 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) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI) },