---

yaml --- r: 366317 b: refs/heads/master c: a5f04b9 h: refs/heads/master i: 366315: 3dcae34 v: v3
git-mirror · Apr 30, 2013 · e53fe3d · e53fe3d
1 parent 30cd9e6
commit e53fe3d
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 399 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a4a5574ce427c364d81746fc7fb82d86b5f1a7e
+refs/heads/master: a5f04b9df1113e0c16271afe5e43028f0d763f13
diff --git a/trunk/drivers/hid/Kconfig b/trunk/drivers/hid/Kconfig
@@ -122,17 +122,6 @@ config HID_APPLE
 	Say Y here if you want support for keyboards of	Apple iBooks, PowerBooks,
 	MacBooks, MacBook Pros and Apple Aluminum.
 
-config HID_APPLEIR
-	tristate "Apple infrared receiver"
-	depends on (USB_HID)
-	---help---
-	Support for Apple infrared remote control. All the Apple computers from
-	  2005 onwards include such a port, except the unibody Macbook (2009),
-	  and Mac Pros. This receiver is also used in the Apple TV set-top box
-	  prior to the 2010 model.
-
-	Say Y here if you want support for Apple infrared remote control.
-
 config HID_AUREAL
 	tristate "Aureal"
 	depends on USB_HID

diff --git a/trunk/drivers/hid/Makefile b/trunk/drivers/hid/Makefile
@@ -39,7 +39,6 @@ endif
 obj-$(CONFIG_HID_A4TECH)	+= hid-a4tech.o
 obj-$(CONFIG_HID_ACRUX)		+= hid-axff.o
 obj-$(CONFIG_HID_APPLE)		+= hid-apple.o
-obj-$(CONFIG_HID_APPLEIR)	+= hid-appleir.o
 obj-$(CONFIG_HID_AUREAL)        += hid-aureal.o
 obj-$(CONFIG_HID_BELKIN)	+= hid-belkin.o
 obj-$(CONFIG_HID_CHERRY)	+= hid-cherry.o

diff --git a/trunk/drivers/hid/hid-apple.c b/trunk/drivers/hid/hid-apple.c
@@ -390,6 +390,10 @@ static void apple_remove(struct hid_device *hdev)
 }
 
 static const struct hid_device_id apple_devices[] = {
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL),
+		.driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4),
+		.driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE),
 		.driver_data = APPLE_MIGHTYMOUSE | APPLE_INVERT_HWHEEL },
 

diff --git a/trunk/drivers/hid/hid-appleir.c b/trunk/drivers/hid/hid-appleir.c