diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-28 03:33:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-29 19:53:59 -0400 |
| commit | 673d5b43daa00b42759cecc6b0760b8bf6be80d2 (patch) | |
| tree | a795ee922db699a8b4cb893ef5809399f1591ba6 /arch/x86_64/kernel/setup.c | |
| parent | 296699de6bdc717189a331ab6bbe90e05c94db06 (diff) | |
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/setup.c')
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 0f400f3c4694..af838f6b0b7f 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c | |||
| @@ -333,7 +333,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 333 | reserve_bootmem_generic(SMP_TRAMPOLINE_BASE, 2*PAGE_SIZE); | 333 | reserve_bootmem_generic(SMP_TRAMPOLINE_BASE, 2*PAGE_SIZE); |
| 334 | #endif | 334 | #endif |
| 335 | 335 | ||
| 336 | #ifdef CONFIG_ACPI | 336 | #ifdef CONFIG_ACPI_SLEEP |
| 337 | /* | 337 | /* |
| 338 | * Reserve low memory region for sleep support. | 338 | * Reserve low memory region for sleep support. |
| 339 | */ | 339 | */ |