diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-02 04:17:41 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-02 04:17:41 +0200 |
| commit | c4361bb64b81f5b81a7a08d58654493385a2f2b2 (patch) | |
| tree | 8741c0b60ddfbc3fc4e17c8d200f6aa6ff32cca0 /arch/x86/power/cpu_64.c | |
| parent | sh: ap325 and Migo-R use new sh_mobile_ceu_info flags (diff) | |
| parent | serial: fixup /proc/tty/driver/serial after proc_fops conversion (diff) | |
| download | linux-c4361bb64b81f5b81a7a08d58654493385a2f2b2.tar.xz linux-c4361bb64b81f5b81a7a08d58654493385a2f2b2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/power/cpu_64.c')
| -rw-r--r-- | arch/x86/power/cpu_64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/power/cpu_64.c b/arch/x86/power/cpu_64.c index e3b6cf70d62c..5343540f2607 100644 --- a/arch/x86/power/cpu_64.c +++ b/arch/x86/power/cpu_64.c @@ -15,6 +15,7 @@ #include <asm/pgtable.h> #include <asm/mtrr.h> #include <asm/xcr.h> +#include <asm/suspend.h> static void fix_processor_context(void); |