diff options
author | Len Brown <len.brown@intel.com> | 2007-07-25 04:26:33 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-07-25 07:29:39 +0200 |
commit | e8b2fd01228f690c3e0cb3f14facfa8d93d4adae (patch) | |
tree | fb69560e2a584a8ca82985a99e42ec189d592091 /arch/i386/kernel/setup.c | |
parent | ACPI: Kconfig: always enable CONFIG_ACPI_SLEEP on X86 (diff) | |
download | linux-e8b2fd01228f690c3e0cb3f14facfa8d93d4adae.tar.xz linux-e8b2fd01228f690c3e0cb3f14facfa8d93d4adae.zip |
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/i386/kernel/setup.c')
-rw-r--r-- | arch/i386/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index d474cd639bcb..7fe5da3c932e 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c @@ -422,7 +422,7 @@ void __init setup_bootmem_allocator(void) */ reserve_bootmem(PAGE_SIZE, PAGE_SIZE); #endif -#ifdef CONFIG_ACPI_SLEEP +#ifdef CONFIG_ACPI /* * Reserve low memory region for sleep support. */ |