diff options
| author | James Bottomley <jejb@mulgrave.(none)> | 2005-11-08 12:50:26 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-11-08 12:50:26 -0500 |
| commit | 383f9749505cef0a30dbd7109db7fe469aa64753 (patch) | |
| tree | 9e88d648396ac99a90d12ccf5471d001e87c65ae /include/linux/pci_ids.h | |
| parent | f093182d313edde9b1f86dbdaf40ba4da2dbd0e7 (diff) | |
| parent | 3da8b713da723e78a03f0404beedf3cc6f4f860b (diff) | |
Merge by hand (conflicts between pending drivers and kfree cleanups)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 9a96f0588393..914b55f4abbb 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -441,6 +441,7 @@ | |||
| 441 | #define PCI_DEVICE_ID_IBM_SNIPE 0x0180 | 441 | #define PCI_DEVICE_ID_IBM_SNIPE 0x0180 |
| 442 | #define PCI_DEVICE_ID_IBM_CITRINE 0x028C | 442 | #define PCI_DEVICE_ID_IBM_CITRINE 0x028C |
| 443 | #define PCI_DEVICE_ID_IBM_GEMSTONE 0xB166 | 443 | #define PCI_DEVICE_ID_IBM_GEMSTONE 0xB166 |
| 444 | #define PCI_DEVICE_ID_IBM_OBSIDIAN 0x02BD | ||
| 444 | #define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1 0x0031 | 445 | #define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1 0x0031 |
| 445 | #define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2 0x0219 | 446 | #define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2 0x0219 |
| 446 | #define PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX 0x021A | 447 | #define PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX 0x021A |
| @@ -2144,6 +2145,7 @@ | |||
| 2144 | #define PCI_DEVICE_ID_ADAPTEC2_7899B 0x00c1 | 2145 | #define PCI_DEVICE_ID_ADAPTEC2_7899B 0x00c1 |
| 2145 | #define PCI_DEVICE_ID_ADAPTEC2_7899D 0x00c3 | 2146 | #define PCI_DEVICE_ID_ADAPTEC2_7899D 0x00c3 |
| 2146 | #define PCI_DEVICE_ID_ADAPTEC2_7899P 0x00cf | 2147 | #define PCI_DEVICE_ID_ADAPTEC2_7899P 0x00cf |
| 2148 | #define PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN 0x0500 | ||
| 2147 | #define PCI_DEVICE_ID_ADAPTEC2_SCAMP 0x0503 | 2149 | #define PCI_DEVICE_ID_ADAPTEC2_SCAMP 0x0503 |
| 2148 | 2150 | ||
| 2149 | 2151 | ||