mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
This commit is contained in:
Ian Campbell committed
commit
ce2abaa5fa
1 file changed
+1
-1
@@ -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>
|
||||
|
||||
|
||||