aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-10-06 05:15:34 -0400
committerJiri Kosina <jkosina@suse.cz>2008-10-14 17:51:02 -0400
commit0f492f2aa908edea5e23c4b0d033b858cd90ea37 (patch)
tree92b642c5220a263d7795fe4b4160bddea0ba9aed /drivers
parentf129ea6d1efe0eddcbb1f0faaec5623788ad9e58 (diff)
HID: add appletv IR receiver quirk
Similar to the existing IRCONTROL4 handling Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/hid-apple.c2
-rw-r--r--drivers/hid/hid-ids.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index a808e57f23a3..fd7f896b34f7 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -359,6 +359,8 @@ static void apple_remove(struct hid_device *hdev)
359} 359}
360 360
361static const struct hid_device_id apple_devices[] = { 361static const struct hid_device_id apple_devices[] = {
362 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL),
363 .driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },
362 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4), 364 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4),
363 .driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT }, 365 .driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },
364 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE), 366 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE),
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index e68b6d9bcd1a..df9c4f92c4a6 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -84,6 +84,7 @@
84#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS 0x0232 84#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS 0x0232
85#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a 85#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
86#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b 86#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
87#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL 0x8241
87#define USB_DEVICE_ID_APPLE_IRCONTROL4 0x8242 88#define USB_DEVICE_ID_APPLE_IRCONTROL4 0x8242
88 89
89#define USB_VENDOR_ID_ASUS 0x0b05 90#define USB_VENDOR_ID_ASUS 0x0b05