diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-19 12:15:01 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-19 12:15:01 -0500 |
| commit | e9ce0c37c2cb203a4fa6a350108199da0cad5a17 (patch) | |
| tree | 9947d729a5c44e4312d90210dd5ba605acffde53 /arch/x86/xen | |
| parent | a7eb518998529c08cc53fef17756d9fe433b0c23 (diff) | |
| parent | 8960f8c8e779fa405f031ca6866d6d3ab88e2eae (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.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 63d49a523ed3..1a5ff24e29c0 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <asm/boot.h> | 9 | #include <asm/boot.h> |
| 10 | #include <asm/asm.h> | 10 | #include <asm/asm.h> |
| 11 | #include <asm/page.h> | 11 | #include <asm/page_types.h> |
| 12 | 12 | ||
| 13 | #include <xen/interface/elfnote.h> | 13 | #include <xen/interface/elfnote.h> |
| 14 | #include <asm/xen/interface.h> | 14 | #include <asm/xen/interface.h> |