diff --git a/[refs] b/[refs] index 9079f02170b8..b748b57dd1e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f797f57a60514eea6fc03644c14e80691dd25727 +refs/heads/master: 08eafb9b2808d8684e55c204609513e924e2da3c diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index f31a7f039e94..199060e588dc 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/arch/i386/kernel/Makefile @@ -25,7 +25,7 @@ obj-$(CONFIG_X86_MPPARSE) += mpparse.o obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o obj-$(CONFIG_X86_IO_APIC) += io_apic_32.o obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups.o -obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_32.o crash.o +obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_32.o crash_32.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o obj-$(CONFIG_X86_NUMAQ) += numaq.o obj-$(CONFIG_X86_SUMMIT_NUMA) += summit.o diff --git a/trunk/arch/i386/kernel/crash.c b/trunk/arch/i386/kernel/crash_32.c similarity index 100% rename from trunk/arch/i386/kernel/crash.c rename to trunk/arch/i386/kernel/crash_32.c