EDAC: Convert to new X86 CPU match macros

[linux-2.6-microblaze.git] / drivers / edac / sb_edac.c

diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 4957e8e..7d51c82 100644 (file)
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -3420,13 +3420,13 @@ fail0:
 }
 
 static const struct x86_cpu_id sbridge_cpuids[] = {
-       INTEL_CPU_FAM6(SANDYBRIDGE_X,     pci_dev_descr_sbridge_table),
-       INTEL_CPU_FAM6(IVYBRIDGE_X,       pci_dev_descr_ibridge_table),
-       INTEL_CPU_FAM6(HASWELL_X,         pci_dev_descr_haswell_table),
-       INTEL_CPU_FAM6(BROADWELL_X,       pci_dev_descr_broadwell_table),
-       INTEL_CPU_FAM6(BROADWELL_D,       pci_dev_descr_broadwell_table),
-       INTEL_CPU_FAM6(XEON_PHI_KNL,      pci_dev_descr_knl_table),
-       INTEL_CPU_FAM6(XEON_PHI_KNM,      pci_dev_descr_knl_table),
+       X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X, &pci_dev_descr_sbridge_table),
+       X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X,   &pci_dev_descr_ibridge_table),
+       X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X,     &pci_dev_descr_haswell_table),
+       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X,   &pci_dev_descr_broadwell_table),
+       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D,   &pci_dev_descr_broadwell_table),
+       X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL,  &pci_dev_descr_knl_table),
+       X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM,  &pci_dev_descr_knl_table),
        { }
 };
 MODULE_DEVICE_TABLE(x86cpu, sbridge_cpuids);