diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
| commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
| tree | b027b5f3429d416b3da5b9195024007dab062a5e /include/linux/pci_ids.h | |
| parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
Merge ../linux-2.6
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 1afac931351e..a6fdbe13a245 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1754,6 +1754,8 @@ | |||
| 1754 | #define PCI_DEVICE_ID_CCD_B00B 0xb00b | 1754 | #define PCI_DEVICE_ID_CCD_B00B 0xb00b |
| 1755 | #define PCI_DEVICE_ID_CCD_B00C 0xb00c | 1755 | #define PCI_DEVICE_ID_CCD_B00C 0xb00c |
| 1756 | #define PCI_DEVICE_ID_CCD_B100 0xb100 | 1756 | #define PCI_DEVICE_ID_CCD_B100 0xb100 |
| 1757 | #define PCI_DEVICE_ID_CCD_B700 0xb700 | ||
| 1758 | #define PCI_DEVICE_ID_CCD_B701 0xb701 | ||
| 1757 | 1759 | ||
| 1758 | #define PCI_VENDOR_ID_EXAR 0x13a8 | 1760 | #define PCI_VENDOR_ID_EXAR 0x13a8 |
| 1759 | #define PCI_DEVICE_ID_EXAR_XR17C152 0x0152 | 1761 | #define PCI_DEVICE_ID_EXAR_XR17C152 0x0152 |