diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:06:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:06:57 -0400 |
commit | 8de547e1824437f3c6af180d3ed2162fa4b3f389 (patch) | |
tree | 1318eea19b4b6a563ea2bbe95cf9b2ad10f92b43 /include/linux/pci_ids.h | |
parent | 76c39e4fef73e42777c27d6b87a04f89ebd0ef66 (diff) | |
parent | e6649cc62949f1ed473bf1131fa425cfe72d3f64 (diff) |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac
* 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac: (25 commits)
i7300_edac: Properly initialize per-csrow memory size
V4L/DVB: i7300_edac: better initialize page counts
MAINTAINERS: Add maintainer for i7300-edac driver
i7300-edac: CodingStyle cleanup
i7300_edac: Improve comments
i7300_edac: Cleanup: reorganize the file contents
i7300_edac: Properly detect channel on CE errors
i7300_edac: enrich FBD error info for corrected errors
i7300_edac: enrich FBD error info for fatal errors
i7300_edac: pre-allocate a buffer used to prepare err messages
i7300_edac: Fix MTR x4/x8 detection logic
i7300_edac: Make the debug messages coherent with the others
i7300_edac: Cleanup: remove get_error_info logic
i7300_edac: Add a code to cleanup error registers
i7300_edac: Add support for reporting FBD errors
i7300_edac: Properly detect the type of error correction
i7300_edac: Detect if the device is on single mode
i7300_edac: Adds detection for enhanced scrub mode on x8
i7300_edac: Clear the error bit after reading
i7300_edac: Add error detection code for global errors
...
Diffstat (limited to 'include/linux/pci_ids.h')
-rw-r--r-- | include/linux/pci_ids.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 90c038c0ad96..d278dd9cb765 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -820,7 +820,7 @@ | |||
820 | 820 | ||
821 | #define PCI_VENDOR_ID_ANIGMA 0x1051 | 821 | #define PCI_VENDOR_ID_ANIGMA 0x1051 |
822 | #define PCI_DEVICE_ID_ANIGMA_MC145575 0x0100 | 822 | #define PCI_DEVICE_ID_ANIGMA_MC145575 0x0100 |
823 | 823 | ||
824 | #define PCI_VENDOR_ID_EFAR 0x1055 | 824 | #define PCI_VENDOR_ID_EFAR 0x1055 |
825 | #define PCI_DEVICE_ID_EFAR_SLC90E66_1 0x9130 | 825 | #define PCI_DEVICE_ID_EFAR_SLC90E66_1 0x9130 |
826 | #define PCI_DEVICE_ID_EFAR_SLC90E66_3 0x9463 | 826 | #define PCI_DEVICE_ID_EFAR_SLC90E66_3 0x9463 |
@@ -1451,7 +1451,7 @@ | |||
1451 | 1451 | ||
1452 | #define PCI_VENDOR_ID_ZIATECH 0x1138 | 1452 | #define PCI_VENDOR_ID_ZIATECH 0x1138 |
1453 | #define PCI_DEVICE_ID_ZIATECH_5550_HC 0x5550 | 1453 | #define PCI_DEVICE_ID_ZIATECH_5550_HC 0x5550 |
1454 | 1454 | ||
1455 | 1455 | ||
1456 | #define PCI_VENDOR_ID_SYSKONNECT 0x1148 | 1456 | #define PCI_VENDOR_ID_SYSKONNECT 0x1148 |
1457 | #define PCI_DEVICE_ID_SYSKONNECT_TR 0x4200 | 1457 | #define PCI_DEVICE_ID_SYSKONNECT_TR 0x4200 |
@@ -1605,8 +1605,8 @@ | |||
1605 | #define PCI_DEVICE_ID_RP8OCTA 0x0005 | 1605 | #define PCI_DEVICE_ID_RP8OCTA 0x0005 |
1606 | #define PCI_DEVICE_ID_RP8J 0x0006 | 1606 | #define PCI_DEVICE_ID_RP8J 0x0006 |
1607 | #define PCI_DEVICE_ID_RP4J 0x0007 | 1607 | #define PCI_DEVICE_ID_RP4J 0x0007 |
1608 | #define PCI_DEVICE_ID_RP8SNI 0x0008 | 1608 | #define PCI_DEVICE_ID_RP8SNI 0x0008 |
1609 | #define PCI_DEVICE_ID_RP16SNI 0x0009 | 1609 | #define PCI_DEVICE_ID_RP16SNI 0x0009 |
1610 | #define PCI_DEVICE_ID_RPP4 0x000A | 1610 | #define PCI_DEVICE_ID_RPP4 0x000A |
1611 | #define PCI_DEVICE_ID_RPP8 0x000B | 1611 | #define PCI_DEVICE_ID_RPP8 0x000B |
1612 | #define PCI_DEVICE_ID_RP4M 0x000D | 1612 | #define PCI_DEVICE_ID_RP4M 0x000D |
@@ -1616,9 +1616,9 @@ | |||
1616 | #define PCI_DEVICE_ID_URP8INTF 0x0802 | 1616 | #define PCI_DEVICE_ID_URP8INTF 0x0802 |
1617 | #define PCI_DEVICE_ID_URP16INTF 0x0803 | 1617 | #define PCI_DEVICE_ID_URP16INTF 0x0803 |
1618 | #define PCI_DEVICE_ID_URP8OCTA 0x0805 | 1618 | #define PCI_DEVICE_ID_URP8OCTA 0x0805 |
1619 | #define PCI_DEVICE_ID_UPCI_RM3_8PORT 0x080C | 1619 | #define PCI_DEVICE_ID_UPCI_RM3_8PORT 0x080C |
1620 | #define PCI_DEVICE_ID_UPCI_RM3_4PORT 0x080D | 1620 | #define PCI_DEVICE_ID_UPCI_RM3_4PORT 0x080D |
1621 | #define PCI_DEVICE_ID_CRP16INTF 0x0903 | 1621 | #define PCI_DEVICE_ID_CRP16INTF 0x0903 |
1622 | 1622 | ||
1623 | #define PCI_VENDOR_ID_CYCLADES 0x120e | 1623 | #define PCI_VENDOR_ID_CYCLADES 0x120e |
1624 | #define PCI_DEVICE_ID_CYCLOM_Y_Lo 0x0100 | 1624 | #define PCI_DEVICE_ID_CYCLOM_Y_Lo 0x0100 |
@@ -2144,7 +2144,7 @@ | |||
2144 | #define PCI_DEVICE_ID_RASTEL_2PORT 0x2000 | 2144 | #define PCI_DEVICE_ID_RASTEL_2PORT 0x2000 |
2145 | 2145 | ||
2146 | #define PCI_VENDOR_ID_ZOLTRIX 0x15b0 | 2146 | #define PCI_VENDOR_ID_ZOLTRIX 0x15b0 |
2147 | #define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0 | 2147 | #define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0 |
2148 | 2148 | ||
2149 | #define PCI_VENDOR_ID_MELLANOX 0x15b3 | 2149 | #define PCI_VENDOR_ID_MELLANOX 0x15b3 |
2150 | #define PCI_DEVICE_ID_MELLANOX_TAVOR 0x5a44 | 2150 | #define PCI_DEVICE_ID_MELLANOX_TAVOR 0x5a44 |
@@ -2431,7 +2431,7 @@ | |||
2431 | #define PCI_DEVICE_ID_INTEL_82815_MC 0x1130 | 2431 | #define PCI_DEVICE_ID_INTEL_82815_MC 0x1130 |
2432 | #define PCI_DEVICE_ID_INTEL_82815_CGC 0x1132 | 2432 | #define PCI_DEVICE_ID_INTEL_82815_CGC 0x1132 |
2433 | #define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221 | 2433 | #define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221 |
2434 | #define PCI_DEVICE_ID_INTEL_7505_0 0x2550 | 2434 | #define PCI_DEVICE_ID_INTEL_7505_0 0x2550 |
2435 | #define PCI_DEVICE_ID_INTEL_7205_0 0x255d | 2435 | #define PCI_DEVICE_ID_INTEL_7205_0 0x255d |
2436 | #define PCI_DEVICE_ID_INTEL_82437 0x122d | 2436 | #define PCI_DEVICE_ID_INTEL_82437 0x122d |
2437 | #define PCI_DEVICE_ID_INTEL_82371FB_0 0x122e | 2437 | #define PCI_DEVICE_ID_INTEL_82371FB_0 0x122e |
@@ -2634,6 +2634,9 @@ | |||
2634 | #define PCI_DEVICE_ID_INTEL_MCH_PC 0x3599 | 2634 | #define PCI_DEVICE_ID_INTEL_MCH_PC 0x3599 |
2635 | #define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a | 2635 | #define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a |
2636 | #define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e | 2636 | #define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e |
2637 | #define PCI_DEVICE_ID_INTEL_I7300_MCH_ERR 0x360c | ||
2638 | #define PCI_DEVICE_ID_INTEL_I7300_MCH_FB0 0x360f | ||
2639 | #define PCI_DEVICE_ID_INTEL_I7300_MCH_FB1 0x3610 | ||
2637 | #define PCI_DEVICE_ID_INTEL_IOAT_CNB 0x360b | 2640 | #define PCI_DEVICE_ID_INTEL_IOAT_CNB 0x360b |
2638 | #define PCI_DEVICE_ID_INTEL_FBD_CNB 0x360c | 2641 | #define PCI_DEVICE_ID_INTEL_FBD_CNB 0x360c |
2639 | #define PCI_DEVICE_ID_INTEL_IOAT_JSF0 0x3710 | 2642 | #define PCI_DEVICE_ID_INTEL_IOAT_JSF0 0x3710 |