ACPI: LPSS: Switch to new Intel CPU model defines

New CPU #defines encode vendor and family as well as model.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/x86/lpss.c b/drivers/acpi/x86/lpss.c
index 148e29c2c526cb4742c143b185703293026c4673..258440b899a958f1f7289cbddc184a285d3cfcc3 100644 (file)
--- a/drivers/acpi/x86/lpss.c
+++ b/drivers/acpi/x86/lpss.c
@@ -338,8 +338,8 @@ static const struct lpss_device_desc bsw_spi_dev_desc = {
 };
 
 static const struct x86_cpu_id lpss_cpu_ids[] = {
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT,     NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT,        NULL),
+       X86_MATCH_VFM(INTEL_ATOM_SILVERMONT,    NULL),
+       X86_MATCH_VFM(INTEL_ATOM_AIRMONT,       NULL),
        {}
 };