---

yaml --- r: 65406 b: refs/heads/master c: fcaf15d h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · b0bc87a · b0bc87a
1 parent 1707f9d
commit b0bc87a
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: deb8677148fef3aea11edd4e980f6eb9c564f3cd
+refs/heads/master: fcaf15d788dc0c8354dbcf449e260cb303120b75
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_X86_MPPARSE)	+= mpparse_32.o
 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_KEXEC)		+= machine_kexec_32.o relocate_kernel_32.o crash_32.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_32.o
 obj-$(CONFIG_X86_NUMAQ)		+= numaq_32.o
 obj-$(CONFIG_X86_SUMMIT_NUMA)	+= summit_32.o

diff --git a/trunk/arch/i386/kernel/machine_kexec.c → trunk/arch/i386/kernel/machine_kexec_32.c b/trunk/arch/i386/kernel/machine_kexec.c → trunk/arch/i386/kernel/machine_kexec_32.c