diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-02-25 01:11:51 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-02-25 01:11:51 +0100 |
| commit | 638bee71c83a2837b48062fdc5b222163cf53d79 (patch) | |
| tree | 9c1699c07a5aa547d769138317279b8ee1ba89e8 /arch/x86/power/hibernate_asm_64.S | |
| parent | Merge branch 'x86/defconfig' into x86/mce2 (diff) | |
| parent | Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', '... (diff) | |
| download | linux-638bee71c83a2837b48062fdc5b222163cf53d79.tar.xz linux-638bee71c83a2837b48062fdc5b222163cf53d79.zip | |
Merge branch 'x86/core' into x86/mce2
Diffstat (limited to 'arch/x86/power/hibernate_asm_64.S')
| -rw-r--r-- | arch/x86/power/hibernate_asm_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/power/hibernate_asm_64.S b/arch/x86/power/hibernate_asm_64.S index 000415947d93..9356547d8c01 100644 --- a/arch/x86/power/hibernate_asm_64.S +++ b/arch/x86/power/hibernate_asm_64.S @@ -18,7 +18,7 @@ .text #include <linux/linkage.h> #include <asm/segment.h> -#include <asm/page.h> +#include <asm/page_types.h> #include <asm/asm-offsets.h> #include <asm/processor-flags.h> |