diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /include/linux/pci_ids.h | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index f1f75fde8cd4..ae27792b5aa4 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -854,6 +854,7 @@ | |||
| 854 | #define PCI_DEVICE_ID_MYLEX_DAC960_LA 0x0020 | 854 | #define PCI_DEVICE_ID_MYLEX_DAC960_LA 0x0020 |
| 855 | #define PCI_DEVICE_ID_MYLEX_DAC960_LP 0x0050 | 855 | #define PCI_DEVICE_ID_MYLEX_DAC960_LP 0x0050 |
| 856 | #define PCI_DEVICE_ID_MYLEX_DAC960_BA 0xBA56 | 856 | #define PCI_DEVICE_ID_MYLEX_DAC960_BA 0xBA56 |
| 857 | #define PCI_DEVICE_ID_MYLEX_DAC960_GEM 0xB166 | ||
| 857 | 858 | ||
| 858 | #define PCI_VENDOR_ID_PICOP 0x1066 | 859 | #define PCI_VENDOR_ID_PICOP 0x1066 |
| 859 | #define PCI_DEVICE_ID_PICOP_PT86C52X 0x0001 | 860 | #define PCI_DEVICE_ID_PICOP_PT86C52X 0x0001 |
| @@ -2062,6 +2063,7 @@ | |||
| 2062 | #define PCI_DEVICE_ID_AFAVLAB_P030 0x2182 | 2063 | #define PCI_DEVICE_ID_AFAVLAB_P030 0x2182 |
| 2063 | 2064 | ||
| 2064 | #define PCI_VENDOR_ID_BROADCOM 0x14e4 | 2065 | #define PCI_VENDOR_ID_BROADCOM 0x14e4 |
| 2066 | #define PCI_DEVICE_ID_TIGON3_5752 0x1600 | ||
| 2065 | #define PCI_DEVICE_ID_TIGON3_5700 0x1644 | 2067 | #define PCI_DEVICE_ID_TIGON3_5700 0x1644 |
| 2066 | #define PCI_DEVICE_ID_TIGON3_5701 0x1645 | 2068 | #define PCI_DEVICE_ID_TIGON3_5701 0x1645 |
| 2067 | #define PCI_DEVICE_ID_TIGON3_5702 0x1646 | 2069 | #define PCI_DEVICE_ID_TIGON3_5702 0x1646 |
| @@ -2414,6 +2416,8 @@ | |||
| 2414 | #define PCI_DEVICE_ID_INTEL_ICH7_1 0x27b9 | 2416 | #define PCI_DEVICE_ID_INTEL_ICH7_1 0x27b9 |
| 2415 | #define PCI_DEVICE_ID_INTEL_ICH7_2 0x27c0 | 2417 | #define PCI_DEVICE_ID_INTEL_ICH7_2 0x27c0 |
| 2416 | #define PCI_DEVICE_ID_INTEL_ICH7_3 0x27c1 | 2418 | #define PCI_DEVICE_ID_INTEL_ICH7_3 0x27c1 |
| 2419 | #define PCI_DEVICE_ID_INTEL_ICH7_30 0x27b0 | ||
| 2420 | #define PCI_DEVICE_ID_INTEL_ICH7_31 0x27bd | ||
| 2417 | #define PCI_DEVICE_ID_INTEL_ICH7_5 0x27c4 | 2421 | #define PCI_DEVICE_ID_INTEL_ICH7_5 0x27c4 |
| 2418 | #define PCI_DEVICE_ID_INTEL_ICH7_6 0x27c5 | 2422 | #define PCI_DEVICE_ID_INTEL_ICH7_6 0x27c5 |
| 2419 | #define PCI_DEVICE_ID_INTEL_ICH7_7 0x27c8 | 2423 | #define PCI_DEVICE_ID_INTEL_ICH7_7 0x27c8 |