diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-02-09 23:24:09 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-02-09 23:24:09 +0100 |
| commit | ef8b03fabfbab0738dacbb6c0c38d5af91759ca1 (patch) | |
| tree | c9d1be39c2d522752adbca205b12091cf24a62a4 /arch/x86/power/Makefile | |
| parent | c57591244a08bb441c83472f5c110151bb7c2cc6 (diff) | |
| download | op-kernel-dev-ef8b03fabfbab0738dacbb6c0c38d5af91759ca1.zip op-kernel-dev-ef8b03fabfbab0738dacbb6c0c38d5af91759ca1.tar.gz | |
x86 PM: consolidate suspend and hibernation code
Move the hibernation-specific code from arch/x86/power/suspend_64.c
to a separate file (hibernate_64.c) and the CPU-handling code to
cpu_64.c (in line with the corresponding 32-bit code).
Simplify arch/x86/power/Makefile .
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/power/Makefile')
| -rw-r--r-- | arch/x86/power/Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/x86/power/Makefile b/arch/x86/power/Makefile index 2c95118..9ff4d5b 100644 --- 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 |
