---

yaml --- r: 65396 b: refs/heads/master c: c94905c h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · 46e05a7 · 46e05a7
1 parent f50f288
commit 46e05a7
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: 826c0e9e6ced6c1bb2d3f067ddff93d706b86446
+refs/heads/master: c94905c5c184686bffde7d0c23cadb64dfce17af
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
@@ -12,7 +12,7 @@ obj-y	:= process.o signal_32.o entry.o traps_32.o irq_32.o \
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
 obj-y				+= cpu/
 obj-y				+= acpi/
-obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot.o
+obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot_32.o
 obj-$(CONFIG_MCA)		+= mca_32.o
 obj-$(CONFIG_X86_MSR)		+= msr.o
 obj-$(CONFIG_X86_CPUID)		+= cpuid.o

diff --git a/trunk/arch/i386/kernel/reboot.c → trunk/arch/i386/kernel/reboot_32.c b/trunk/arch/i386/kernel/reboot.c → trunk/arch/i386/kernel/reboot_32.c