diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-09-11 14:08:41 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-09-11 14:08:41 -0400 |
| commit | 623b3e1d645e42030897d18d37db10133d763006 (patch) | |
| tree | 090ff481cd72b47ff87d50615461712a33ba41e6 /include/linux/pci_ids.h | |
| parent | c576af479162c0a11d4e2691ebc97354958d9285 (diff) | |
| parent | 38f5745c5a90641079fd5b48600ae63f7ab6edcd (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 4c2839eab7f..7a249155ee4 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -648,6 +648,8 @@ #define PCI_DEVICE_ID_SI_962 0x0962 #define PCI_DEVICE_ID_SI_963 0x0963 #define PCI_DEVICE_ID_SI_965 0x0965 +#define PCI_DEVICE_ID_SI_966 0x0966 +#define PCI_DEVICE_ID_SI_968 0x0968 #define PCI_DEVICE_ID_SI_5511 0x5511 #define PCI_DEVICE_ID_SI_5513 0x5513 #define PCI_DEVICE_ID_SI_5517 0x5517 @@ -1292,6 +1294,7 @@ #define PCI_DEVICE_ID_VIA_8367_0 0x3099 #define PCI_DEVICE_ID_VIA_8653_0 0x3101 #define PCI_DEVICE_ID_VIA_8622 0x3102 +#define PCI_DEVICE_ID_VIA_8235_USB_2 0x3104 #define PCI_DEVICE_ID_VIA_8233C_0 0x3109 #define PCI_DEVICE_ID_VIA_8361 0x3112 #define PCI_DEVICE_ID_VIA_XM266 0x3116 |