---

yaml --- r: 80191 b: refs/heads/master c: 4d022e3 h: refs/heads/master i: 80189: 6fd22f1 80187: 6f41f66 80183: 593d1bd 80175: f38ae57 80159: e3355ff 80127: 9c0bf71 v: v3
git-mirror · Jan 30, 2008 · ca4dfd2 · ca4dfd2
1 parent a6c613c
commit ca4dfd2
Show file tree

Hide file tree

Showing 5 changed files with 164 additions and 316 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71c339116a216b181fc5e203ef51a033fe5e38cf
+refs/heads/master: 4d022e35fd7e07c522c7863fee6f07e53cf3fc14
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
@@ -30,8 +30,8 @@ obj-y				+= step.o
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
 obj-y				+= cpu/
 obj-y				+= acpi/
-obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot_32.o
-obj-$(CONFIG_X86_64)            += reboot_64.o
+obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot.o
+obj-$(CONFIG_X86_64)		+= reboot.o
 obj-$(CONFIG_MCA)		+= mca_32.o
 obj-$(CONFIG_X86_MSR)		+= msr.o
 obj-$(CONFIG_X86_CPUID)		+= cpuid.o