Merge branch 'linus' into x86/urgent

[~andy/linux] / arch / x86 / power / Makefile

diff --git a/arch/x86/power/Makefile b/arch/x86/power/Makefile
index d764ec950065686d96bbd92e49440de08e538270..9ff4d5b55ad182852ef5c4fd2dbb11a372525275 100644 (file)
--- a/arch/x86/power/Makefile
+++ b/arch/x86/power/Makefile
@@ -1,2 +1,2 @@
-obj-$(CONFIG_PM)               += cpu.o
-obj-$(CONFIG_HIBERNATION)      += swsusp.o suspend.o
+obj-$(CONFIG_PM_SLEEP)         += cpu_$(BITS).o
+obj-$(CONFIG_HIBERNATION)      += hibernate_$(BITS).o hibernate_asm_$(BITS).o