aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/edac/i7core_edac.c6
-rw-r--r--include/linux/pci_ids.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index c2857f60ae6a..bb538dfbdc6c 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -291,7 +291,7 @@ struct pci_id_descr pci_dev_descr[] = {
291 * the probing code needs to test for the other address in case of 291 * the probing code needs to test for the other address in case of
292 * failure of this one 292 * failure of this one
293 */ 293 */
294 { PCI_DESCR(0, 0, PCI_DEVICE_ID_INTEL_I7_NOCORE) }, 294 { PCI_DESCR(0, 0, PCI_DEVICE_ID_INTEL_I7_NONCORE) },
295 295
296}; 296};
297#define N_DEVS ARRAY_SIZE(pci_dev_descr) 297#define N_DEVS ARRAY_SIZE(pci_dev_descr)
@@ -1177,9 +1177,9 @@ int i7core_get_onedevice(struct pci_dev **prev, int devno)
1177 * is at addr 8086:2c40, instead of 8086:2c41. So, we need 1177 * is at addr 8086:2c40, instead of 8086:2c41. So, we need
1178 * to probe for the alternate address in case of failure 1178 * to probe for the alternate address in case of failure
1179 */ 1179 */
1180 if (pci_dev_descr[devno].dev_id == PCI_DEVICE_ID_INTEL_I7_NOCORE && !pdev) 1180 if (pci_dev_descr[devno].dev_id == PCI_DEVICE_ID_INTEL_I7_NONCORE && !pdev)
1181 pdev = pci_get_device(PCI_VENDOR_ID_INTEL, 1181 pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
1182 PCI_DEVICE_ID_INTEL_I7_NOCORE_ALT, *prev); 1182 PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT, *prev);
1183 1183
1184 if (!pdev) { 1184 if (!pdev) {
1185 if (*prev) { 1185 if (*prev) {
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index bf6db4814c27..382476a8a339 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2548,8 +2548,8 @@
2548#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_ADDR 0x2c31 2548#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_ADDR 0x2c31
2549#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_RANK 0x2c32 2549#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_RANK 0x2c32
2550#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_TC 0x2c33 2550#define PCI_DEVICE_ID_INTEL_I7_MC_CH2_TC 0x2c33
2551#define PCI_DEVICE_ID_INTEL_I7_NOCORE 0x2c41 2551#define PCI_DEVICE_ID_INTEL_I7_NONCORE 0x2c41
2552#define PCI_DEVICE_ID_INTEL_I7_NOCORE_ALT 0x2c40 2552#define PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT 0x2c40
2553#define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340 2553#define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340
2554#define PCI_DEVICE_ID_INTEL_IOAT_TBG4 0x3429 2554#define PCI_DEVICE_ID_INTEL_IOAT_TBG4 0x3429
2555#define PCI_DEVICE_ID_INTEL_IOAT_TBG5 0x342a 2555#define PCI_DEVICE_ID_INTEL_IOAT_TBG5 0x342a