aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/xen
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-19 18:15:01 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-19 18:15:01 +0100
commite9ce0c37c2cb203a4fa6a350108199da0cad5a17 (patch)
tree9947d729a5c44e4312d90210dd5ba605acffde53 /arch/x86/xen
parenta7eb518998529c08cc53fef17756d9fe433b0c23 (diff)
parent8960f8c8e779fa405f031ca6866d6d3ab88e2eae (diff)
Merge branch 'x86/untangle2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/headers
Diffstat (limited to 'arch/x86/xen')
-rw-r--r--arch/x86/xen/xen-head.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
index 63d49a523ed..1a5ff24e29c 100644
--- a/arch/x86/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
@@ -8,7 +8,7 @@
#include <asm/boot.h>
#include <asm/asm.h>
-#include <asm/page.h>
+#include <asm/page_types.h>
#include <xen/interface/elfnote.h>
#include <asm/xen/interface.h>