]> git.karo-electronics.de Git - linux-beck.git/commitdiff
i7core_edac: PCI device is called NONCORE, instead of NOCORE
authorMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 14 Oct 2009 09:07:07 +0000 (06:07 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 10 May 2010 14:49:31 +0000 (11:49 -0300)
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/edac/i7core_edac.c
include/linux/pci_ids.h

index c2857f60ae6a04f436b17c62c54f72c3912d252d..bb538dfbdc6c7aa906e4a4e24d30acce061a1a42 100644 (file)
@@ -291,7 +291,7 @@ struct pci_id_descr pci_dev_descr[] = {
         * the probing code needs to test for the other address in case of
         * failure of this one
         */
-       { PCI_DESCR(0, 0, PCI_DEVICE_ID_INTEL_I7_NOCORE)  },
+       { PCI_DESCR(0, 0, PCI_DEVICE_ID_INTEL_I7_NONCORE)  },
 
 };
 #define N_DEVS ARRAY_SIZE(pci_dev_descr)
@@ -1177,9 +1177,9 @@ int i7core_get_onedevice(struct pci_dev **prev, int devno)
         * is at addr 8086:2c40, instead of 8086:2c41. So, we need
         * to probe for the alternate address in case of failure
         */
-       if (pci_dev_descr[devno].dev_id == PCI_DEVICE_ID_INTEL_I7_NOCORE && !pdev)
+       if (pci_dev_descr[devno].dev_id == PCI_DEVICE_ID_INTEL_I7_NONCORE && !pdev)
                pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
-                                     PCI_DEVICE_ID_INTEL_I7_NOCORE_ALT, *prev);
+                                     PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT, *prev);
 
        if (!pdev) {
                if (*prev) {
index bf6db4814c277fcca348ff7ad965f9303de3b95b..382476a8a339c0b2b87b6e75dc82e86441489286 100644 (file)
 #define PCI_DEVICE_ID_INTEL_I7_MC_CH2_ADDR  0x2c31
 #define PCI_DEVICE_ID_INTEL_I7_MC_CH2_RANK  0x2c32
 #define PCI_DEVICE_ID_INTEL_I7_MC_CH2_TC    0x2c33
-#define PCI_DEVICE_ID_INTEL_I7_NOCORE  0x2c41
-#define PCI_DEVICE_ID_INTEL_I7_NOCORE_ALT 0x2c40
+#define PCI_DEVICE_ID_INTEL_I7_NONCORE 0x2c41
+#define PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT 0x2c40
 #define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG4  0x3429
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG5  0x342a