Index: 2006-01-05/arch/x86_64/kernel/Makefile
===================================================================
--- 2006-01-05.orig/arch/x86_64/kernel/Makefile	2006-01-05 16:53:02.519533664 +0100
+++ 2006-01-05/arch/x86_64/kernel/Makefile	2006-01-05 17:14:53.470238864 +0100
@@ -23,7 +23,8 @@ obj-$(CONFIG_X86_XEN_GENAPIC)	+= genapic
 obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o mpparse.o \
 		genapic.o genapic_cluster.o genapic_flat.o
 obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o crash.o
-obj-$(CONFIG_PM)		+= suspend.o
+obj-$(CONFIG_SOFTWARE_SUSPEND)	+= suspend.o
+obj-$(CONFIG_ACPI_SLEEP)	+= suspend.o
 obj-$(CONFIG_SOFTWARE_SUSPEND)	+= suspend_asm.o
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o