summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-07-25 04:26:33 +0200
committerLen Brown <len.brown@intel.com>2007-07-25 07:29:39 +0200
commite8b2fd01228f690c3e0cb3f14facfa8d93d4adae (patch)
treefb69560e2a584a8ca82985a99e42ec189d592091 /arch/i386/kernel/acpi
parentACPI: Kconfig: always enable CONFIG_ACPI_SLEEP on X86 (diff)
downloadlinux-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/acpi')
-rw-r--r--arch/i386/kernel/acpi/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/acpi/Makefile b/arch/i386/kernel/acpi/Makefile
index 7f7be01f44e6..223f58fc9f46 100644
--- a/arch/i386/kernel/acpi/Makefile
+++ b/arch/i386/kernel/acpi/Makefile
@@ -2,7 +2,7 @@ obj-$(CONFIG_ACPI) += boot.o
ifneq ($(CONFIG_PCI),)
obj-$(CONFIG_X86_IO_APIC) += earlyquirk.o
endif
-obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o
+obj-$(CONFIG_ACPI) += sleep.o wakeup.o
ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += cstate.o processor.o