<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/gpu/drm/i915/intel_cpu_info.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_cpu_info.c 
b/drivers/gpu/drm/i915/intel_cpu_info.c
index e52d0ac713a..a6b46cc841a 100644
--- a/drivers/gpu/drm/i915/intel_cpu_info.c
+++ b/drivers/gpu/drm/i915/intel_cpu_info.c
@@ -6,12 +6,11 @@
  * intel_device_info.h by having a separate file.
  */
 
+#include <asm/cpu_device_id.h>
+
 #include "intel_cpu_info.h"
 
 #ifdef CONFIG_X86
-#include <asm/cpu_device_id.h>
-#include <asm/intel-family.h>
-
 static const struct x86_cpu_id g8_cpu_ids[] = {
        X86_MATCH_VFM(INTEL_ALDERLAKE,          NULL),
        X86_MATCH_VFM(INTEL_ALDERLAKE_L,        NULL),
-- 
2.54.0

Reply via email to