diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 09:37:56 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 09:37:56 -0500 |
| commit | 4c1ac1b49122b805adfa4efc620592f68dccf5db (patch) | |
| tree | 87557f4bc2fd4fe65b7570489c2f610c45c0adcd /include/linux/pci_ids.h | |
| parent | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (diff) | |
| parent | d916faace3efc0bf19fe9a615a1ab8fa1a24cd93 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.c
Fix up merge failures with Linus's head and fix new compilation failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index fa4e1d799782..c09da1e30c54 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1213,6 +1213,10 @@ | |||
| 1213 | #define PCI_DEVICE_ID_NVIDIA_NVENET_21 0x0451 | 1213 | #define PCI_DEVICE_ID_NVIDIA_NVENET_21 0x0451 |
| 1214 | #define PCI_DEVICE_ID_NVIDIA_NVENET_22 0x0452 | 1214 | #define PCI_DEVICE_ID_NVIDIA_NVENET_22 0x0452 |
| 1215 | #define PCI_DEVICE_ID_NVIDIA_NVENET_23 0x0453 | 1215 | #define PCI_DEVICE_ID_NVIDIA_NVENET_23 0x0453 |
| 1216 | #define PCI_DEVICE_ID_NVIDIA_NVENET_24 0x054C | ||
| 1217 | #define PCI_DEVICE_ID_NVIDIA_NVENET_25 0x054D | ||
| 1218 | #define PCI_DEVICE_ID_NVIDIA_NVENET_26 0x054E | ||
| 1219 | #define PCI_DEVICE_ID_NVIDIA_NVENET_27 0x054F | ||
| 1216 | #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE 0x0560 | 1220 | #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE 0x0560 |
| 1217 | 1221 | ||
| 1218 | #define PCI_VENDOR_ID_IMS 0x10e0 | 1222 | #define PCI_VENDOR_ID_IMS 0x10e0 |
| @@ -1893,6 +1897,7 @@ | |||
| 1893 | #define PCI_VENDOR_ID_BROADCOM 0x14e4 | 1897 | #define PCI_VENDOR_ID_BROADCOM 0x14e4 |
| 1894 | #define PCI_DEVICE_ID_TIGON3_5752 0x1600 | 1898 | #define PCI_DEVICE_ID_TIGON3_5752 0x1600 |
| 1895 | #define PCI_DEVICE_ID_TIGON3_5752M 0x1601 | 1899 | #define PCI_DEVICE_ID_TIGON3_5752M 0x1601 |
| 1900 | #define PCI_DEVICE_ID_NX2_5709 0x1639 | ||
| 1896 | #define PCI_DEVICE_ID_TIGON3_5700 0x1644 | 1901 | #define PCI_DEVICE_ID_TIGON3_5700 0x1644 |
| 1897 | #define PCI_DEVICE_ID_TIGON3_5701 0x1645 | 1902 | #define PCI_DEVICE_ID_TIGON3_5701 0x1645 |
| 1898 | #define PCI_DEVICE_ID_TIGON3_5702 0x1646 | 1903 | #define PCI_DEVICE_ID_TIGON3_5702 0x1646 |
| @@ -2211,6 +2216,13 @@ | |||
| 2211 | #define PCI_DEVICE_ID_INTEL_ICH8_4 0x2815 | 2216 | #define PCI_DEVICE_ID_INTEL_ICH8_4 0x2815 |
| 2212 | #define PCI_DEVICE_ID_INTEL_ICH8_5 0x283e | 2217 | #define PCI_DEVICE_ID_INTEL_ICH8_5 0x283e |
| 2213 | #define PCI_DEVICE_ID_INTEL_ICH8_6 0x2850 | 2218 | #define PCI_DEVICE_ID_INTEL_ICH8_6 0x2850 |
| 2219 | #define PCI_DEVICE_ID_INTEL_ICH9_0 0x2910 | ||
| 2220 | #define PCI_DEVICE_ID_INTEL_ICH9_1 0x2911 | ||
| 2221 | #define PCI_DEVICE_ID_INTEL_ICH9_2 0x2912 | ||
| 2222 | #define PCI_DEVICE_ID_INTEL_ICH9_3 0x2913 | ||
| 2223 | #define PCI_DEVICE_ID_INTEL_ICH9_4 0x2914 | ||
| 2224 | #define PCI_DEVICE_ID_INTEL_ICH9_5 0x2915 | ||
| 2225 | #define PCI_DEVICE_ID_INTEL_ICH9_6 0x2930 | ||
| 2214 | #define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340 | 2226 | #define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340 |
| 2215 | #define PCI_DEVICE_ID_INTEL_82830_HB 0x3575 | 2227 | #define PCI_DEVICE_ID_INTEL_82830_HB 0x3575 |
| 2216 | #define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577 | 2228 | #define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577 |