diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 19:27:15 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 19:27:15 +0000 |
| commit | a33528d510dcb2e83b5ff48fb020acd97e9af2db (patch) | |
| tree | 4838facd92bb3cfae92f01a6dfb780cc47c29d7e /arch/x86/virt/vmx | |
| parent | Releasing progress-linux version 6.9.12-1~progress7.99u1. (diff) | |
| download | linux-a33528d510dcb2e83b5ff48fb020acd97e9af2db.tar.xz linux-a33528d510dcb2e83b5ff48fb020acd97e9af2db.zip | |
Merging upstream version 6.10.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'arch/x86/virt/vmx')
| -rw-r--r-- | arch/x86/virt/vmx/tdx/tdx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c index 4d6826a76f..49a1c6890b 100644 --- a/arch/x86/virt/vmx/tdx/tdx.c +++ b/arch/x86/virt/vmx/tdx/tdx.c @@ -27,7 +27,6 @@ #include <linux/log2.h> #include <linux/acpi.h> #include <linux/suspend.h> -#include <linux/acpi.h> #include <asm/page.h> #include <asm/special_insns.h> #include <asm/msr-index.h> |