diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-13 12:49:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-13 12:49:04 -0800 |
| commit | 928b3f12e5fea9d201bbc029d8d537ba7cc14fe7 (patch) | |
| tree | 3f496d22dc052cff9fb31cfe93aee54f2fd99356 /drivers | |
| parent | Merge tag 'media/v4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media (diff) | |
| parent | efi: include asm/early_ioremap.h not asm/efi.h to get early_memremap (diff) | |
| download | linux-dev-928b3f12e5fea9d201bbc029d8d537ba7cc14fe7.tar.xz linux-dev-928b3f12e5fea9d201bbc029d8d537ba7cc14fe7.zip | |
Merge tag 'please-pull-fixefi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 build fixes from Tony Luck:
"The ARM guys broke the ia64 build ... but gave me fixes, so it's all
good now"
* tag 'please-pull-fixefi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
efi: include asm/early_ioremap.h not asm/efi.h to get early_memremap
ia64: split off early_ioremap() declarations into asm/early_ioremap.h
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/efi/efi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index cffa89b3317b..2cd37dad67a6 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -25,7 +25,7 @@ #include <linux/io.h> #include <linux/platform_device.h> -#include <asm/efi.h> +#include <asm/early_ioremap.h> struct efi __read_mostly efi = { .mps = EFI_INVALID_TABLE_ADDR, |