---

yaml --- r: 65471 b: refs/heads/master c: ba733ec h: refs/heads/master i: 65469: 8763109 65467: c995b60 65463: 150fa6f 65455: 392fe40 65439: 34329ad 65407: eec7c4b v: v3
git-mirror · Oct 11, 2007 · cb429dd · cb429dd
1 parent 0e1bc64
commit cb429dd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e86a989de27d4c0226928d6132f284f6156f30f7
+refs/heads/master: ba733ec4725df406a6ff5c5c1e6c447f42bbf39d
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/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/trunk/arch/x86_64/kernel/suspend_asm.S → trunk/arch/x86_64/kernel/suspend_asm_64.S b/trunk/arch/x86_64/kernel/suspend_asm.S → trunk/arch/x86_64/kernel/suspend_asm_64.S