diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-10 22:07:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-10 22:07:55 -0400 |
| commit | bf65dea87e87c53ba4f97c6432761498bc977efd (patch) | |
| tree | 965920af213277ccd76e76d5296d7841569ba3b3 /include | |
| parent | 4d9708ea5e5a45973df7cf965805fdfb185dd5bf (diff) | |
| parent | d0585cd815faef50ce3d12cbe173438eb4d81eb8 (diff) | |
Merge tag 'edac/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
Pull edac updates from Mauro Carvalho Chehab:
"Nothing really exiting here: just one bug fix at sb_edac, and some
changes to allow other drivers to use some shared PCI addresses"
* tag 'edac/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
sb_edac: Claim a different PCI device
Move Intel SNB device ids from sb_edac to pci_ids.h
sb_edac: avoid INTERNAL ERROR message in EDAC with unspecified channel
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci_ids.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index da9e6f753196..2338e68398cb 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2820,7 +2820,22 @@ | |||
| 2820 | #define PCI_DEVICE_ID_INTEL_UNC_R2PCIE 0x3c43 | 2820 | #define PCI_DEVICE_ID_INTEL_UNC_R2PCIE 0x3c43 |
| 2821 | #define PCI_DEVICE_ID_INTEL_UNC_R3QPI0 0x3c44 | 2821 | #define PCI_DEVICE_ID_INTEL_UNC_R3QPI0 0x3c44 |
| 2822 | #define PCI_DEVICE_ID_INTEL_UNC_R3QPI1 0x3c45 | 2822 | #define PCI_DEVICE_ID_INTEL_UNC_R3QPI1 0x3c45 |
| 2823 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_RAS 0x3c71 /* 15.1 */ | ||
| 2824 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR0 0x3c72 /* 16.2 */ | ||
| 2825 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR1 0x3c73 /* 16.3 */ | ||
| 2826 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR2 0x3c76 /* 16.6 */ | ||
| 2827 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR3 0x3c77 /* 16.7 */ | ||
| 2828 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_HA0 0x3ca0 /* 14.0 */ | ||
| 2829 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA 0x3ca8 /* 15.0 */ | ||
| 2830 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD0 0x3caa /* 15.2 */ | ||
| 2831 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD1 0x3cab /* 15.3 */ | ||
| 2832 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD2 0x3cac /* 15.4 */ | ||
| 2833 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD3 0x3cad /* 15.5 */ | ||
| 2834 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_DDRIO 0x3cb8 /* 17.0 */ | ||
| 2823 | #define PCI_DEVICE_ID_INTEL_JAKETOWN_UBOX 0x3ce0 | 2835 | #define PCI_DEVICE_ID_INTEL_JAKETOWN_UBOX 0x3ce0 |
| 2836 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0 0x3cf4 /* 12.6 */ | ||
| 2837 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_BR 0x3cf5 /* 13.6 */ | ||
| 2838 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD1 0x3cf6 /* 12.7 */ | ||
| 2824 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f | 2839 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f |
| 2825 | #define PCI_DEVICE_ID_INTEL_5100_16 0x65f0 | 2840 | #define PCI_DEVICE_ID_INTEL_5100_16 0x65f0 |
| 2826 | #define PCI_DEVICE_ID_INTEL_5100_19 0x65f3 | 2841 | #define PCI_DEVICE_ID_INTEL_5100_19 0x65f3 |