diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 13:14:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 13:14:16 -0800 |
| commit | 39470bf24d93927bb27929b9f0d52ff5d608cfcb (patch) | |
| tree | 36c5f47fbf29f58f96970083a7e0d44d34cdf81d /drivers/usb/input/hid-core.c | |
| parent | 2596627c5c30b45aa206b7b1b864bf00de3c3503 (diff) | |
| parent | 39559b4ff89e390c42633d23d257e793a1177e03 (diff) | |
| download | kernel_samsung_smdk4412-39470bf24d93927bb27929b9f0d52ff5d608cfcb.zip kernel_samsung_smdk4412-39470bf24d93927bb27929b9f0d52ff5d608cfcb.tar.gz kernel_samsung_smdk4412-39470bf24d93927bb27929b9f0d52ff5d608cfcb.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: unusual_devs.h entry for nokia 6233
USB: Fix for typo in ohci-ep93xx.c
USB: disable USB_MULTITHREAD_PROBE
USB: add vendor/device id for Option GT Max 3.6 cards
USB: unusual_devs.h for 0x046b:ff40
USB: make usbhid ignore Imation Disc Stakka
USB: rndis_host: fix crash while probing a Nokia S60 mobile
USB: asix: Detect internal PHY and enable/use accordingly
usbtouchscreen: make ITM screens report BTN_TOUCH as zero when not touched
Diffstat (limited to 'drivers/usb/input/hid-core.c')
| -rw-r--r-- | drivers/usb/input/hid-core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index 6e739ef..ea3636d 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c @@ -796,6 +796,9 @@ void usbhid_init_reports(struct hid_device *hid) #define USB_VENDOR_ID_LOGITECH 0x046d #define USB_DEVICE_ID_LOGITECH_USB_RECEIVER 0xc101 +#define USB_VENDOR_ID_IMATION 0x0718 +#define USB_DEVICE_ID_DISC_STAKKA 0xd000 + /* * Alphabetically sorted blacklist by quirk type. */ @@ -883,6 +886,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_GTCO_IPANEL_1, USB_DEVICE_ID_GTCO_10, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_8, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_d, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY, HID_QUIRK_IGNORE }, |