x86 PM: consolidate suspend and hibernation code

[linux-2.6-omap-h63xx.git] / arch / x86 / power / Makefile

diff --git a/arch/x86/power/Makefile b/arch/x86/power/Makefile
index 2c95118e510aeb1df3126e2090cda5a233564959..9ff4d5b55ad182852ef5c4fd2dbb11a372525275 100644 (file)
--- a/arch/x86/power/Makefile
+++ b/arch/x86/power/Makefile
@@ -1,7 +1,2 @@
-ifeq ($(CONFIG_X86_64),y)
-        obj-$(CONFIG_PM)               += suspend_64.o
-        obj-$(CONFIG_HIBERNATION)      += hibernate_asm_64.o
-else
-       obj-$(CONFIG_PM)                += cpu_32.o
-       obj-$(CONFIG_HIBERNATION)       += hibernate_32.o hibernate_asm_32.o
-endif
+obj-$(CONFIG_PM_SLEEP)         += cpu_$(BITS).o
+obj-$(CONFIG_HIBERNATION)      += hibernate_$(BITS).o hibernate_asm_$(BITS).o