diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-17 09:47:44 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-17 09:47:44 +0200 |
commit | d8218b0de51f36f01ed67731ccf174059a33bb1e (patch) | |
tree | b38b8856852ab651c4297c33ba47a49ca4dde419 /arch/x86/platform | |
parent | 76e78f3df8f5d21b1a85f770fa92a1fd211e429b (diff) | |
parent | d07f6ca923ea0927a1024dfccafc5b53b61cfecc (diff) | |
download | linux-d8218b0de51f36f01ed67731ccf174059a33bb1e.tar.bz2 |
Merge 5.13-rc2 into staging-next
We need the staging and iio fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/platform')
-rw-r--r-- | arch/x86/platform/efi/efi_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index df7b5477fc4f..7515e78ef898 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@ -47,7 +47,7 @@ #include <asm/realmode.h> #include <asm/time.h> #include <asm/pgalloc.h> -#include <asm/sev-es.h> +#include <asm/sev.h> /* * We allocate runtime services regions top-down, starting from -4G, i.e. |