summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2008-11-21 11:04:18 +0100
committerHenrik Rydberg <rydberg@euromail.se>2008-11-21 11:04:18 +0100
commitcd647a67b10d99d18e2b44f9a1d1ff5198358b9c (patch)
tree9abcce888c9867ddacfe164ee015b67f4cf4ffb3 /usr
parent5745ce5e5669ab8e1fc2e10362cc6065acb65414 (diff)
Upgrade to Ubuntu-2.6.27-8.17-168-g62eb459
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'usr')
-rw-r--r--usr/src/dkms_source_tree/hid-quirks.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/dkms_source_tree/hid-quirks.c b/usr/src/dkms_source_tree/hid-quirks.c
index 870247d..069fe6f 100644
--- a/usr/src/dkms_source_tree/hid-quirks.c
+++ b/usr/src/dkms_source_tree/hid-quirks.c
@@ -150,6 +150,7 @@
150 150
151#define USB_VENDOR_ID_GAMERON 0x0810 151#define USB_VENDOR_ID_GAMERON 0x0810
152#define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR 0x0001 152#define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR 0x0001
153#define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR 0x0002
153 154
154#define USB_VENDOR_ID_GENERAL_TOUCH 0x0dfc 155#define USB_VENDOR_ID_GENERAL_TOUCH 0x0dfc
155 156
@@ -446,6 +447,7 @@ static const struct hid_blacklist {
446 { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD }, 447 { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD },
447 { USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD }, 448 { USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD },
448 { USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR, HID_QUIRK_MULTI_INPUT }, 449 { USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR, HID_QUIRK_MULTI_INPUT },
450 { USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR, HID_QUIRK_MULTI_INPUT },
449 { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, 451 { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
450 { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, 452 { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
451 { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, 453 { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },