From: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> Another straightforward replacement of magic numbers. Signed-off-by: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> Cc: "Rafael J. Wysocki" <rjw@xxxxxxxxxxxxx> Cc: Len Brown <lenb@xxxxxxxxxx> Cc: linux-acpi@xxxxxxxxxxxxxxx --- b/drivers/acpi/acpi_lpss.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN drivers/acpi/acpi_lpss.c~x86-intel-families-lpss drivers/acpi/acpi_lpss.c --- a/drivers/acpi/acpi_lpss.c~x86-intel-families-lpss 2016-06-01 15:45:08.536142672 -0700 +++ b/drivers/acpi/acpi_lpss.c 2016-06-01 15:45:08.541142900 -0700 @@ -29,6 +29,7 @@ ACPI_MODULE_NAME("acpi_lpss"); #ifdef CONFIG_X86_INTEL_LPSS #include <asm/cpu_device_id.h> +#include <asm/intel-family.h> #include <asm/iosf_mbi.h> #include <asm/pmc_atom.h> @@ -229,8 +230,8 @@ static const struct lpss_device_desc bsw #define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } static const struct x86_cpu_id lpss_cpu_ids[] = { - ICPU(0x37), /* Valleyview, Bay Trail */ - ICPU(0x4c), /* Braswell, Cherry Trail */ + ICPU(INTEL_FAM6_MODEL_ATOM_SILVERMONT1), /* Valleyview, Bay Trail */ + ICPU(INTEL_FAM6_MODEL_ATOM_AIRMONT), /* Braswell, Cherry Trail */ {} }; _ -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html