---

yaml --- r: 65496 b: refs/heads/master c: 2a232a7 h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · 07815bb · 07815bb
1 parent c1f278e
commit 07815bb
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: 81656390b8dec51ba7b4713a321b353fb2d3ccb1
+refs/heads/master: 2a232a7656c085ecde659dc1dbaf65cc4fbf7ed7
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
@@ -22,7 +22,7 @@ obj-$(CONFIG_MICROCODE)		+= microcode.o
 obj-$(CONFIG_X86_CPUID)		+= cpuid.o
 obj-$(CONFIG_SMP)		+= smp_64.o smpboot_64.o trampoline_64.o tsc_sync.o
 obj-y				+= apic_64.o  nmi_64.o
-obj-y				+= io_apic_64.o mpparse_64.o genapic_64.o genapic_flat.o
+obj-y				+= io_apic_64.o mpparse_64.o genapic_64.o genapic_flat_64.o
 obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel_64.o crash_64.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_64.o
 obj-$(CONFIG_PM)		+= suspend_64.o

diff --git a/trunk/arch/x86_64/kernel/genapic_flat.c → trunk/arch/x86_64/kernel/genapic_flat_64.c b/trunk/arch/x86_64/kernel/genapic_flat.c → trunk/arch/x86_64/kernel/genapic_flat_64.c