summaryrefslogtreecommitdiff
path: root/drivers/firmware/efi/efi.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-02-03 13:30:36 +0300
committerIngo Molnar <mingo@kernel.org>2016-02-03 13:30:36 +0300
commit03e075b38e6cd25267c8d6e2797fa4537ca3348d (patch)
tree608ece74f1b3cca290e3408a29cf73e822f0ef4d /drivers/firmware/efi/efi.c
parent753b11ef8e92a1c1bbe97f2a5ec14bdd1ef2e6fe (diff)
parent34229b277480f46c1e9a19f027f30b074512e68b (diff)
downloadlinux-03e075b38e6cd25267c8d6e2797fa4537ca3348d.tar.xz
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.c2
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,