diff --git a/[refs] b/[refs] index 34efc9a0da90..a8ae1a09f875 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c94905c5c184686bffde7d0c23cadb64dfce17af +refs/heads/master: 26ab6533a683e92129cfa5f2365924d007c119f3 diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index 863f68d10d69..3cf5ca824a6c 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/arch/i386/kernel/Makefile @@ -26,7 +26,7 @@ obj-$(CONFIG_X86_LOCAL_APIC) += apic_32.o nmi_32.o obj-$(CONFIG_X86_IO_APIC) += io_apic_32.o obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_32.o crash_32.o -obj-$(CONFIG_CRASH_DUMP) += crash_dump.o +obj-$(CONFIG_CRASH_DUMP) += crash_dump_32.o obj-$(CONFIG_X86_NUMAQ) += numaq_32.o obj-$(CONFIG_X86_SUMMIT_NUMA) += summit_32.o obj-$(CONFIG_KPROBES) += kprobes.o diff --git a/trunk/arch/i386/kernel/crash_dump.c b/trunk/arch/i386/kernel/crash_dump_32.c similarity index 100% rename from trunk/arch/i386/kernel/crash_dump.c rename to trunk/arch/i386/kernel/crash_dump_32.c