diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2021-06-30 12:52:24 +0200 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2021-06-30 12:52:24 +0200 |
| commit | 0bcc3939c98d83955397eac1584d5f791fdc88d0 (patch) | |
| tree | 21e6be9c578916ca86ffe0f88a9d807435318964 /arch/x86/platform/efi/efi_64.c | |
| parent | 600d050944e133fde1f54b9113b01ccefbd82820 (diff) | |
| parent | c17e5c85b32f8809135f3211ba2525fb98b5c09f (diff) | |
Merge tag 'spi-nor/for-5.14' into mtd/next
SPI NOR core changes:
- Ability to dump SFDP tables via sysfs
- Support for erasing OTP regions on Winbond and similar flashes
- Few API doc updates and fixes
- Locking support for MX25L12805D
SPI NOR controller drivers changes:
- Use SPI_MODE_X_MASK in nxp-spifi
- Intel Alder Lake-M SPI serial flash support
Diffstat (limited to 'arch/x86/platform/efi/efi_64.c')
| -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. |