[PATCH 6/7] tpm: Include <asm/cpu_device_id.h> unconditionally

From: Pavel Popov

Date: Wed Nov 11 2026 - 18:58:07 EST


<asm/cpu_device_id.h> now has a generic version, so the #ifdef
CONFIG_X86 around the include is no longer needed.

Signed-off-by: Pavel Popov <pavel.e.popov@xxxxxxxxx>
---
Depends on <asm-generic/cpu_device_id.h> from [1]; please apply after
it is in mainline.

[1] https://lore.kernel.org/r/20261111234439.4098-1-pavel.e.popov@xxxxxxxxx

drivers/char/tpm/tpm.h | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index fa554c5ad80..ad1534aa00c 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -28,9 +28,7 @@
#include <linux/tpm.h>
#include <linux/tpm_eventlog.h>

-#ifdef CONFIG_X86
#include <asm/cpu_device_id.h>
-#endif

#define TPM_MINOR 224 /* officially assigned */
#define TPM_NUM_DEVICES 65536
--
2.54.0