diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2012-01-15 08:35:28 +0100 |
|---|---|---|
| committer | Bjørn Mork <bjorn@mork.no> | 2012-01-15 08:35:28 +0100 |
| commit | 6528209ba2c94f3a0ef946b7d808d9a15b30ec50 (patch) | |
| tree | c3c1b8bcf8ae19f411c53c2f199f923742bcc256 /drivers/usb/core/quirks.c | |
| parent | a056fb3687c40b8a1123de1586f491285cb5fb1f (diff) | |
| parent | f2ab2a127d480ee20caf8620440ccf13c014447a (diff) | |
Merge remote branch 'stable/linux-2.6.32.y' into 2.6.32-mantismedia/2.6.32-mantis
Diffstat (limited to 'drivers/usb/core/quirks.c')
| -rw-r--r-- | drivers/usb/core/quirks.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index e163df980a4..4923702e7a6 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -114,9 +114,12 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x06a3, 0x0006), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS }, - /* Guillemot Webcam Hercules Dualpix Exchange*/ + /* Guillemot Webcam Hercules Dualpix Exchange (2nd ID) */ { USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Guillemot Webcam Hercules Dualpix Exchange*/ + { USB_DEVICE(0x06f8, 0x3005), .driver_info = USB_QUIRK_RESET_RESUME }, + /* M-Systems Flash Disk Pioneers */ { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME }, |