diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-05-13 11:44:02 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-05-13 11:44:02 +0100 |
| commit | ce2abaa5faae6662ddb93fc77b39ecf087d4c95f (patch) | |
| tree | ad58a9b380a3d185028eafb5bbbf16e3bee1e191 | |
| parent | 667d8a84b244d02e9c6a2d02d6a02fc90c2efb4e (diff) | |
| parent | 9b670aceff75f9d61bfe842a09520bfccb418df7 (diff) | |
| download | xen-ce2abaa5faae6662ddb93fc77b39ecf087d4c95f.tar.gz xen-ce2abaa5faae6662ddb93fc77b39ecf087d4c95f.tar.bz2 xen-ce2abaa5faae6662ddb93fc77b39ecf087d4c95f.zip | |
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
| -rw-r--r-- | xen/arch/x86/efi/boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 44bc7b7670..117a5cbe43 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -8,6 +8,7 @@ #include <xen/init.h> #include <xen/keyhandler.h> #include <xen/lib.h> +#include <xen/mm.h> #include <xen/multiboot.h> #include <xen/pci_regs.h> #include <xen/pfn.h> @@ -22,7 +23,6 @@ #define __ASSEMBLY__ /* avoid pulling in ACPI stuff (conflicts with EFI) */ #include <asm/fixmap.h> #undef __ASSEMBLY__ -#include <asm/mm.h> #include <asm/msr.h> #include <asm/processor.h> |