diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-09-13 17:07:18 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-09-13 17:07:18 -0400 |
| commit | c547fc28ab3e8716076fdaf4bd0260c5d63a18f7 (patch) | |
| tree | 34af1fa64a63618660187ae58ad182665a1861ef /include/linux/pci_ids.h | |
| parent | 3dd836a56de0d4f049438412959b905e1db4666e (diff) | |
| parent | 63b98080daa35f0d682db04f4fb7ada010888752 (diff) | |
Merge branch 'linux-2.6'
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 4c2839eab7f4..7a249155ee4e 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -648,6 +648,8 @@ | |||
| 648 | #define PCI_DEVICE_ID_SI_962 0x0962 | 648 | #define PCI_DEVICE_ID_SI_962 0x0962 |
| 649 | #define PCI_DEVICE_ID_SI_963 0x0963 | 649 | #define PCI_DEVICE_ID_SI_963 0x0963 |
| 650 | #define PCI_DEVICE_ID_SI_965 0x0965 | 650 | #define PCI_DEVICE_ID_SI_965 0x0965 |
| 651 | #define PCI_DEVICE_ID_SI_966 0x0966 | ||
| 652 | #define PCI_DEVICE_ID_SI_968 0x0968 | ||
| 651 | #define PCI_DEVICE_ID_SI_5511 0x5511 | 653 | #define PCI_DEVICE_ID_SI_5511 0x5511 |
| 652 | #define PCI_DEVICE_ID_SI_5513 0x5513 | 654 | #define PCI_DEVICE_ID_SI_5513 0x5513 |
| 653 | #define PCI_DEVICE_ID_SI_5517 0x5517 | 655 | #define PCI_DEVICE_ID_SI_5517 0x5517 |
| @@ -1292,6 +1294,7 @@ | |||
| 1292 | #define PCI_DEVICE_ID_VIA_8367_0 0x3099 | 1294 | #define PCI_DEVICE_ID_VIA_8367_0 0x3099 |
| 1293 | #define PCI_DEVICE_ID_VIA_8653_0 0x3101 | 1295 | #define PCI_DEVICE_ID_VIA_8653_0 0x3101 |
| 1294 | #define PCI_DEVICE_ID_VIA_8622 0x3102 | 1296 | #define PCI_DEVICE_ID_VIA_8622 0x3102 |
| 1297 | #define PCI_DEVICE_ID_VIA_8235_USB_2 0x3104 | ||
| 1295 | #define PCI_DEVICE_ID_VIA_8233C_0 0x3109 | 1298 | #define PCI_DEVICE_ID_VIA_8233C_0 0x3109 |
| 1296 | #define PCI_DEVICE_ID_VIA_8361 0x3112 | 1299 | #define PCI_DEVICE_ID_VIA_8361 0x3112 |
| 1297 | #define PCI_DEVICE_ID_VIA_XM266 0x3116 | 1300 | #define PCI_DEVICE_ID_VIA_XM266 0x3116 |