From c774603fe044d00aca98a484bc2b89f3ad8b080a Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:14:57 +0200 Subject: [PATCH] --- yaml --- r: 65485 b: refs/heads/master c: 2c7de090f86d9972a741a313de76996865814b74 h: refs/heads/master i: 65483: eae22d2da59c0bb8491d8ef13dffd8baa7861250 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/Makefile | 2 +- trunk/arch/x86_64/kernel/{suspend.c => suspend_64.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/kernel/{suspend.c => suspend_64.c} (100%) diff --git a/[refs] b/[refs] index 9de935400516..871fb5fb46cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e877d83a8e2643a026559a60ac6d1ee9fb827677 +refs/heads/master: 2c7de090f86d9972a741a313de76996865814b74 diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile index edd3ad7995d6..2da29ed79c13 100644 --- a/trunk/arch/x86_64/kernel/Makefile +++ b/trunk/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/trunk/arch/x86_64/kernel/suspend.c b/trunk/arch/x86_64/kernel/suspend_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/suspend.c rename to trunk/arch/x86_64/kernel/suspend_64.c