diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/pci_ids.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/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 70eb3c803d47..cf6dbd759395 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1429,6 +1429,7 @@ | |||
| 1429 | #define PCI_DEVICE_ID_NEO_2DB9PRI 0x00C9 | 1429 | #define PCI_DEVICE_ID_NEO_2DB9PRI 0x00C9 |
| 1430 | #define PCI_DEVICE_ID_NEO_2RJ45 0x00CA | 1430 | #define PCI_DEVICE_ID_NEO_2RJ45 0x00CA |
| 1431 | #define PCI_DEVICE_ID_NEO_2RJ45PRI 0x00CB | 1431 | #define PCI_DEVICE_ID_NEO_2RJ45PRI 0x00CB |
| 1432 | #define PCIE_DEVICE_ID_NEO_4_IBM 0x00F4 | ||
| 1432 | 1433 | ||
| 1433 | #define PCI_VENDOR_ID_XIRCOM 0x115d | 1434 | #define PCI_VENDOR_ID_XIRCOM 0x115d |
| 1434 | #define PCI_DEVICE_ID_XIRCOM_RBM56G 0x0101 | 1435 | #define PCI_DEVICE_ID_XIRCOM_RBM56G 0x0101 |
| @@ -2413,6 +2414,8 @@ | |||
| 2413 | #define PCI_DEVICE_ID_INTEL_82443GX_0 0x71a0 | 2414 | #define PCI_DEVICE_ID_INTEL_82443GX_0 0x71a0 |
| 2414 | #define PCI_DEVICE_ID_INTEL_82443GX_2 0x71a2 | 2415 | #define PCI_DEVICE_ID_INTEL_82443GX_2 0x71a2 |
| 2415 | #define PCI_DEVICE_ID_INTEL_82372FB_1 0x7601 | 2416 | #define PCI_DEVICE_ID_INTEL_82372FB_1 0x7601 |
| 2417 | #define PCI_DEVICE_ID_INTEL_SCH_LPC 0x8119 | ||
| 2418 | #define PCI_DEVICE_ID_INTEL_SCH_IDE 0x811a | ||
| 2416 | #define PCI_DEVICE_ID_INTEL_82454GX 0x84c4 | 2419 | #define PCI_DEVICE_ID_INTEL_82454GX 0x84c4 |
| 2417 | #define PCI_DEVICE_ID_INTEL_82450GX 0x84c5 | 2420 | #define PCI_DEVICE_ID_INTEL_82450GX 0x84c5 |
| 2418 | #define PCI_DEVICE_ID_INTEL_82451NX 0x84ca | 2421 | #define PCI_DEVICE_ID_INTEL_82451NX 0x84ca |