---

yaml --- r: 116448 b: refs/heads/master c: 26d347c h: refs/heads/master v: v3
git-mirror · Oct 16, 2008 · 105a130 · 105a130
1 parent 6fb2ca3
commit 105a130
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3,915 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54168ed7f2a4f3fc2780e645124ae952598da601
+refs/heads/master: 26d347c2c035b1f4c5b3c5094f3046db9ec920f5
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
@@ -61,7 +61,7 @@ obj-$(CONFIG_X86_64_SMP)	+= tsc_sync.o smpcommon.o
 obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline_$(BITS).o
 obj-$(CONFIG_X86_MPPARSE)	+= mpparse.o
 obj-$(CONFIG_X86_LOCAL_APIC)	+= apic_$(BITS).o nmi.o
-obj-$(CONFIG_X86_IO_APIC)	+= io_apic_$(BITS).o
+obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o
 obj-$(CONFIG_X86_REBOOTFIXUPS)	+= reboot_fixups_32.o
 obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o
 obj-$(CONFIG_KEXEC)		+= machine_kexec_$(BITS).o

diff --git a/trunk/arch/x86/kernel/io_apic_32.c → trunk/arch/x86/kernel/io_apic.c b/trunk/arch/x86/kernel/io_apic_32.c → trunk/arch/x86/kernel/io_apic.c