diff --git a/[refs] b/[refs] index fb40bfca68fe..7d6cb268acff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1cce595a8394105ea56499f94373dd8d5b0d3b51 +refs/heads/master: 0c45a7730bbad8a3770da2698243e45b117092be diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile index bb043aee7f4a..71e90bb88e42 100644 --- a/trunk/arch/x86_64/kernel/Makefile +++ b/trunk/arch/x86_64/kernel/Makefile @@ -24,7 +24,7 @@ obj-$(CONFIG_SMP) += smp_64.o smpboot_64.o trampoline_64.o tsc_sync.o 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_CRASH_DUMP) += crash_dump_64.o obj-$(CONFIG_PM) += suspend_64.o obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o obj-$(CONFIG_CPU_FREQ) += ../../i386/kernel/cpu/cpufreq/ diff --git a/trunk/arch/x86_64/kernel/crash_dump.c b/trunk/arch/x86_64/kernel/crash_dump_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/crash_dump.c rename to trunk/arch/x86_64/kernel/crash_dump_64.c