<asm/cpu_device_id.h> now has a generic version, so the #ifdef CONFIG_X86 around the include is no longer needed.
<asm/intel-family.h> is included by <asm/cpu_device_id.h>. The CPU match table still needs CONFIG_X86 for the INTEL_* model defines. Signed-off-by: Pavel Popov <[email protected]> --- Depends on <asm-generic/cpu_device_id.h> from [1]; please apply after it is in mainline. [1] https://lore.kernel.org/r/[email protected] drivers/acpi/mipi-disco-img.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/mipi-disco-img.c b/drivers/acpi/mipi-disco-img.c index ea4bffe3c02..3d841d2bdfd 100644 --- a/drivers/acpi/mipi-disco-img.c +++ b/drivers/acpi/mipi-disco-img.c @@ -30,6 +30,8 @@ #include <media/v4l2-fwnode.h> +#include <asm/cpu_device_id.h> + #include "internal.h" static LIST_HEAD(acpi_mipi_crs_csi2_list); @@ -724,9 +726,6 @@ void acpi_mipi_crs_csi2_cleanup(void) } #ifdef CONFIG_X86 -#include <asm/cpu_device_id.h> -#include <asm/intel-family.h> - /* CPU matches for Dell generations with broken ACPI MIPI DISCO info */ static const struct x86_cpu_id dell_broken_mipi_disco_cpu_gens[] = { X86_MATCH_VFM(INTEL_TIGERLAKE, NULL), -- 2.54.0
