summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/dkms_source_tree/KERNEL_SOURCE_VERSION2
-rw-r--r--usr/src/dkms_source_tree/dkms.conf2
-rw-r--r--usr/src/dkms_source_tree/hid-quirks.c2
3 files changed, 4 insertions, 2 deletions
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 @@
1NAME=usbhid 1NAME=usbhid
2VERSION=0.11.1 2VERSION=0.11.2
3PACKAGE_NAME="$NAME" 3PACKAGE_NAME="$NAME"
4PACKAGE_VERSION="$VERSION" 4PACKAGE_VERSION="$VERSION"
5MAKE[0]="make -C ${kernel_source_dir} 5MAKE[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 @@
86#define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238 86#define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238
87#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a 87#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
88#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b 88#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
89#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL 0x8241
89#define USB_DEVICE_ID_APPLE_IRCONTROL4 0x8242 90#define USB_DEVICE_ID_APPLE_IRCONTROL4 0x8242
90 91
91#define USB_VENDOR_ID_ASUS 0x0b05 92#define USB_VENDOR_ID_ASUS 0x0b05
@@ -463,6 +464,7 @@ static const struct hid_blacklist {
463 { USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL }, 464 { USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL },
464 465
465 { USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM, HID_QUIRK_HIDDEV }, 466 { USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM, HID_QUIRK_HIDDEV },
467 { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT },
466 { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT }, 468 { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT },
467 { USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT }, 469 { USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT },
468 { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV, HID_QUIRK_HIDINPUT }, 470 { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV, HID_QUIRK_HIDINPUT },