diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-23 05:00:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-23 05:00:43 -0500 |
| commit | 05e3423c8577126800841bc55de8a509f2433dca (patch) | |
| tree | a775c11372b208eba67e8bc5f1ac23029ba4e172 /arch/x86 | |
| parent | bfe2a3c3b5bf479788d5d5c5561346be6b169043 (diff) | |
| parent | 99d0000f710f3432182761f65f9658f1cf0bf455 (diff) | |
Merge branch 'core/percpu' into perfcounters/core
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/xen/suspend.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c index 212ffe012b76..95be7b434724 100644 --- a/arch/x86/xen/suspend.c +++ b/arch/x86/xen/suspend.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include <asm/xen/hypercall.h> | 7 | #include <asm/xen/hypercall.h> |
| 8 | #include <asm/xen/page.h> | 8 | #include <asm/xen/page.h> |
| 9 | #include <asm/fixmap.h> | ||
| 9 | 10 | ||
| 10 | #include "xen-ops.h" | 11 | #include "xen-ops.h" |
| 11 | #include "mmu.h" | 12 | #include "mmu.h" |