diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-02-09 17:24:09 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-02-09 17:24:09 -0500 |
commit | cf7700fe24301df2c8d3636cf40784651c098207 (patch) | |
tree | 2897be493f1b9af0c3a992c541a22f403c6e405c /arch/x86/power/Makefile | |
parent | 9b706aee7d92d6ac3002547aea12e3eaa0a750ae (diff) |
x86 PM: move 64-bit hibernation files to arch/x86/power
Move arch/x86/kernel/suspend_64.c to arch/x86/power .
Move arch/x86/kernel/suspend_asm_64.S to arch/x86/power
as hibernate_asm_64.S .
Update purpose and copyright information in
arch/x86/power/suspend_64.c and
arch/x86/power/hibernate_asm_64.S .
Update the Makefiles in arch/x86, arch/x86/kernel and
arch/x86/power to reflect the above changes.
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, 7 insertions, 2 deletions
diff --git a/arch/x86/power/Makefile b/arch/x86/power/Makefile index d764ec950065..8ce87fb4abb4 100644 --- a/arch/x86/power/Makefile +++ b/arch/x86/power/Makefile | |||
@@ -1,2 +1,7 @@ | |||
1 | obj-$(CONFIG_PM) += cpu.o | 1 | ifeq ($(CONFIG_X86_64),y) |
2 | obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o | 2 | obj-$(CONFIG_PM) += suspend_64.o |
3 | obj-$(CONFIG_HIBERNATION) += hibernate_asm_64.o | ||
4 | else | ||
5 | obj-$(CONFIG_PM) += cpu.o | ||
6 | obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o | ||
7 | endif | ||