aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:57 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:57 +0200
commit2c7de090f86d9972a741a313de76996865814b74 (patch)
treed993abc3275ef65195165b9e817a7743a90b9638 /arch/x86_64/kernel
parentx86_64: prepare shared kernel/audit.c (diff)
downloadlinux-dev-2c7de090f86d9972a741a313de76996865814b74.tar.xz
linux-dev-2c7de090f86d9972a741a313de76996865814b74.zip
x86_64: prepare shared kernel/suspend.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86_64/kernel')
-rw-r--r--arch/x86_64/kernel/Makefile2
-rw-r--r--arch/x86_64/kernel/suspend_64.c (renamed from arch/x86_64/kernel/suspend.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index edd3ad7995d6..2da29ed79c13 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -25,7 +25,7 @@ obj-y += apic_64.o nmi_64.o
obj-y += io_apic_64.o mpparse_64.o genapic_64.o genapic_flat.o
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_64.o crash_64.o
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
-obj-$(CONFIG_PM) += suspend.o
+obj-$(CONFIG_PM) += suspend_64.o
obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o
obj-$(CONFIG_CPU_FREQ) += ../../i386/kernel/cpu/cpufreq/
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
diff --git a/arch/x86_64/kernel/suspend.c b/arch/x86_64/kernel/suspend_64.c
index 573c0a6e0ac6..573c0a6e0ac6 100644
--- a/arch/x86_64/kernel/suspend.c
+++ b/arch/x86_64/kernel/suspend_64.c