summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:37 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:37 +0200
commitba733ec4725df406a6ff5c5c1e6c447f42bbf39d (patch)
tree1a1c87f6a332472145f8543bd60c7a2ac31386ae /arch/x86_64/kernel
parente86a989de27d4c0226928d6132f284f6156f30f7 (diff)
downloadop-kernel-dev-ba733ec4725df406a6ff5c5c1e6c447f42bbf39d.zip
op-kernel-dev-ba733ec4725df406a6ff5c5c1e6c447f42bbf39d.tar.gz
x86_64: prepare shared kernel/suspend_asm.S
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_asm_64.S (renamed from arch/x86_64/kernel/suspend_asm.S)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index 4702333..9799e58 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -26,7 +26,7 @@ obj-y += io_apic_64.o mpparse.o genapic.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_HIBERNATION) += suspend_asm.o
+obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o
obj-$(CONFIG_CPU_FREQ) += ../../i386/kernel/cpu/cpufreq/
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_IOMMU) += pci-gart.o aperture_64.o
diff --git a/arch/x86_64/kernel/suspend_asm.S b/arch/x86_64/kernel/suspend_asm_64.S
index 16d183f..16d183f 100644
--- a/arch/x86_64/kernel/suspend_asm.S
+++ b/arch/x86_64/kernel/suspend_asm_64.S
OpenPOWER on IntegriCloud