diff options
author | Len Brown | 2007-07-28 09:33:16 +0200 |
---|---|---|
committer | Linus Torvalds | 2007-07-30 01:53:59 +0200 |
commit | 673d5b43daa00b42759cecc6b0760b8bf6be80d2 (patch) | |
tree | a795ee922db699a8b4cb893ef5809399f1591ba6 /arch/x86_64/kernel/head.S | |
parent | Introduce CONFIG_SUSPEND for suspend-to-Ram and standby (diff) | |
download | kernel-qcow2-linux-673d5b43daa00b42759cecc6b0760b8bf6be80d2.tar.gz kernel-qcow2-linux-673d5b43daa00b42759cecc6b0760b8bf6be80d2.tar.xz kernel-qcow2-linux-673d5b43daa00b42759cecc6b0760b8bf6be80d2.zip |
ACPI: restore CONFIG_ACPI_SLEEP
Restore the 2.6.22 CONFIG_ACPI_SLEEP build option, but now shadowing the
new CONFIG_PM_SLEEP option.
Signed-off-by: Len Brown <len.brown@intel.com>
[ Modified to work with the PM config setup changes. ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64/kernel/head.S')
-rw-r--r-- | arch/x86_64/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/head.S b/arch/x86_64/kernel/head.S index 3a16e417dd8d..e89abcdbdde8 100644 --- a/arch/x86_64/kernel/head.S +++ b/arch/x86_64/kernel/head.S @@ -120,7 +120,7 @@ ident_complete: addq %rbp, trampoline_level4_pgt + 0(%rip) addq %rbp, trampoline_level4_pgt + (511*8)(%rip) #endif -#ifdef CONFIG_ACPI +#ifdef CONFIG_ACPI_SLEEP addq %rbp, wakeup_level4_pgt + 0(%rip) addq %rbp, wakeup_level4_pgt + (511*8)(%rip) #endif |