diff options
author | Ingo Molnar | 2016-02-03 11:30:36 +0100 |
---|---|---|
committer | Ingo Molnar | 2016-02-03 11:30:36 +0100 |
commit | 03e075b38e6cd25267c8d6e2797fa4537ca3348d (patch) | |
tree | 608ece74f1b3cca290e3408a29cf73e822f0ef4d /drivers/firmware/efi/efi.c | |
parent | x86/efi: Setup separate EFI page tables in kexec paths (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | kernel-qcow2-linux-03e075b38e6cd25267c8d6e2797fa4537ca3348d.tar.gz kernel-qcow2-linux-03e075b38e6cd25267c8d6e2797fa4537ca3348d.tar.xz kernel-qcow2-linux-03e075b38e6cd25267c8d6e2797fa4537ca3348d.zip |
Merge branch 'linus' into efi/core, to refresh the branch and to pick up recent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firmware/efi/efi.c')
-rw-r--r-- | drivers/firmware/efi/efi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index e9c458ba9353..9b815c813687 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -25,6 +25,8 @@ #include <linux/io.h> #include <linux/platform_device.h> +#include <asm/early_ioremap.h> + struct efi __read_mostly efi = { .mps = EFI_INVALID_TABLE_ADDR, .acpi = EFI_INVALID_TABLE_ADDR, |