The following commit has been merged into the x86/cpu branch of tip: Commit-ID: 20d320c664f9bdedb4a1b0029b539aec8c0a71b1 Gitweb: https://git.kernel.org/tip/20d320c664f9bdedb4a1b0029b539aec8c0a71b1 Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Fri, 20 Mar 2020 14:13:59 +01:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Tue, 24 Mar 2020 21:34:11 +01:00 extcon: axp288: Convert to new X86 CPU match macros The new macro set has a consistent namespace and uses C99 initializers instead of the grufty C89 ones. Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Reviewed-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20200320131510.075227793@xxxxxxxxxxxxx --- drivers/extcon/extcon-axp288.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c index a7f2161..34b7aff 100644 --- a/drivers/extcon/extcon-axp288.c +++ b/drivers/extcon/extcon-axp288.c @@ -107,7 +107,7 @@ struct axp288_extcon_info { }; static const struct x86_cpu_id cherry_trail_cpu_ids[] = { - { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_AIRMONT, X86_FEATURE_ANY }, + X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, NULL), {} };
![]() |