ACPI sleep depends on software suspend (at least for now)

arch/i386/kernel/Makefile

@@ -27,7 +27,6 @@ obj-$(CONFIG_SMP)		+= smp.o smpboot.o trampoline.o
 obj-$(CONFIG_X86_LOCAL_APIC)	+= mpparse.o apic.o nmi.o
 obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o
 obj-$(CONFIG_SOFTWARE_SUSPEND)	+= suspend.o
-obj-$(CONFIG_ACPI_SLEEP)	+= suspend.o
 ifdef CONFIG_VISWS
 obj-y += setup-visws.o
 obj-$(CONFIG_X86_VISWS_APIC)	+= visws_apic.o

drivers/acpi/Config.in

@@ -23,7 +23,7 @@ if [ "$CONFIG_X86" = "y" ]; then
       if [ "$CONFIG_PCI" = "y" ]; then
         define_bool CONFIG_ACPI_PCI		y
       fi
-      define_bool CONFIG_ACPI_SLEEP		y
+      define_bool CONFIG_ACPI_SLEEP		$CONFIG_SOFTWARE_SUSPEND
       define_bool CONFIG_ACPI_SYSTEM		y
       tristate     '  AC Adapter'	CONFIG_ACPI_AC
       tristate     '  Battery'		CONFIG_ACPI_BATTERY