Upgrade to Ubuntu-2.6.27-11.25-27-g42d903dHEADmaster

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

9 files changed, 15 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 7c64663..12e33c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME    = usbhid
-VERSION = 0.11.1
+VERSION = 0.11.2
 SRC     = usr/src
 DKMSSRC = $(SRC)/dkms_source_tree
 
diff --git a/debian/changelog b/debian/changelog
index 1b89244..d41a332 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+usbhid-dkms (0.11.2) unstable; urgency=low
+
+  * Upgrade to Ubuntu-2.6.27-11.25-27-g42d903d
+        
+ -- Henrik Rydberg <rydberg@euromail.se>  Sat, 24 Jan 2009 12:42:51 +0100
+
 usbhid-dkms (0.11.1) unstable; urgency=low
 
   * Upgrade to Ubuntu-2.6.27-8.17-168-g62eb459
diff --git a/debian/postinst b/debian/postinst
index b2cf9c6..0ba84c1 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,7 +3,7 @@
 set -e
 
 NAME=usbhid
-VERSION=0.11.1
+VERSION=0.11.2
 
 case "$1" in
     configure)
diff --git a/debian/postrm b/debian/postrm
index 532b6a2..4fbce47 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=usbhid
-VERSION=0.11.1
+VERSION=0.11.2
 
 set -e
 
diff --git a/debian/prerm b/debian/prerm
index 75925e6..38bf126 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=usbhid
-VERSION=0.11.1
+VERSION=0.11.2
 
 set -e
 
diff --git a/debian/rules b/debian/rules
index c814003..56eb9d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 NAME=usbhid
-VERSION=0.11.1
+VERSION=0.11.2
 
 configure: configure-stamp
 configure-stamp:
diff --git a/usr/src/dkms_source_tree/KERNEL_SOURCE_VERSION b/usr/src/dkms_source_tree/KERNEL_SOURCE_VERSION
index 9cd2822..af13335 100644
--- a/usr/src/dkms_source_tree/KERNEL_SOURCE_VERSION
+++ b/usr/src/dkms_source_tree/KERNEL_SOURCE_VERSION
@@ -1 +1 @@
-2.6.27-7-generic
+2.6.27-9-generic
diff --git a/usr/src/dkms_source_tree/dkms.conf b/usr/src/dkms_source_tree/dkms.conf
index 36f4df6..284ec52 100644
--- a/usr/src/dkms_source_tree/dkms.conf
+++ b/usr/src/dkms_source_tree/dkms.conf
@@ -1,5 +1,5 @@
 NAME=usbhid
-VERSION=0.11.1
+VERSION=0.11.2
 PACKAGE_NAME="$NAME"
 PACKAGE_VERSION="$VERSION"
 MAKE[0]="make -C ${kernel_source_dir}
diff --git a/usr/src/dkms_source_tree/hid-quirks.c b/usr/src/dkms_source_tree/hid-quirks.c
index 069fe6f..b44c2e9 100644
--- a/usr/src/dkms_source_tree/hid-quirks.c
+++ b/usr/src/dkms_source_tree/hid-quirks.c
@@ -86,6 +86,7 @@
 #define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS     0x0238
 #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY    0x030a
 #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY     0x030b
+#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL       0x8241
 #define USB_DEVICE_ID_APPLE_IRCONTROL4  0x8242
 
 #define USB_VENDOR_ID_ASUS              0x0b05
@@ -463,6 +464,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL },
 
         { USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM, HID_QUIRK_HIDDEV },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT },
         { USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT },
         { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV, HID_QUIRK_HIDINPUT },