diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-01 14:40:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-01 14:40:37 -0400 |
| commit | d738752fc46c4cc339bc66346cf6134446ce08db (patch) | |
| tree | d7ca1400a1f6c4f53d4ecc8f1c83c810353b377b /include/linux | |
| parent | a930363881c225fb52824145d1ba8f1a8c447dd8 (diff) | |
| parent | db59b464f8708cdba857f16b183cff0b7466d6b5 (diff) | |
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:
uhci-hcd: fix list access bug
USB: Support for ELECOM LD-USB20 in pegasus
USB: Add VIA quirk fixup for VT8235 usb2
USB: rtl8150_disconnect() needs tasklet_kill()
USB Storage: unusual_devs.h for Sony Ericsson M600i
USB Storage: Remove the finecam3 unusual_devs entry
UHCI: don't stop at an Iso error
usb gadget: g_ether spinlock recursion fix
USB: add all wacom device to hid-core.c blacklist
hid-core.c: Adds all GTCO CalComp Digitizers and InterWrite School Products to blacklist
USB floppy drive SAMSUNG SFD-321U/EP detected 8 times
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 4c2839eab7f4..c91164ea3dec 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1292,6 +1292,7 @@ | |||
| 1292 | #define PCI_DEVICE_ID_VIA_8367_0 0x3099 | 1292 | #define PCI_DEVICE_ID_VIA_8367_0 0x3099 |
| 1293 | #define PCI_DEVICE_ID_VIA_8653_0 0x3101 | 1293 | #define PCI_DEVICE_ID_VIA_8653_0 0x3101 |
| 1294 | #define PCI_DEVICE_ID_VIA_8622 0x3102 | 1294 | #define PCI_DEVICE_ID_VIA_8622 0x3102 |
| 1295 | #define PCI_DEVICE_ID_VIA_8235_USB_2 0x3104 | ||
| 1295 | #define PCI_DEVICE_ID_VIA_8233C_0 0x3109 | 1296 | #define PCI_DEVICE_ID_VIA_8233C_0 0x3109 |
| 1296 | #define PCI_DEVICE_ID_VIA_8361 0x3112 | 1297 | #define PCI_DEVICE_ID_VIA_8361 0x3112 |
| 1297 | #define PCI_DEVICE_ID_VIA_XM266 0x3116 | 1298 | #define PCI_DEVICE_ID_VIA_XM266 0x3116 |