diff options
author | Len Brown <len.brown@intel.com> | 2007-07-24 22:26:33 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-07-25 01:29:39 -0400 |
commit | e8b2fd01228f690c3e0cb3f14facfa8d93d4adae (patch) | |
tree | fb69560e2a584a8ca82985a99e42ec189d592091 /arch/x86_64/kernel/setup.c | |
parent | 7c5aa6642fa26641ebf286966a165aec71c91991 (diff) |
ACPI: Kconfig: remove CONFIG_ACPI_SLEEP from source
As it was a synonym for (CONFIG_ACPI && CONFIG_X86),
the ifdefs for it were more clutter than they were worth.
For ia64, just add a few stubs in anticipation of future
S3 or S4 support.
Signed-off-by: Len Brown <len.brown@intel.com>
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 af838f6b0b7f..0f400f3c4694 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_SLEEP | 336 | #ifdef CONFIG_ACPI |
337 | /* | 337 | /* |
338 | * Reserve low memory region for sleep support. | 338 | * Reserve low memory region for sleep support. |
339 | */ | 339 | */ |