From: Andrew Morton <akpm@osdl.org>

arch/i386/kernel/acpi/boot.c:61: redefinition of `ioapic_setup_disabled'
include/asm/acpi.h:139: `ioapic_setup_disabled' previously defined here

Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/kernel/acpi/boot.c |    1 -
 1 files changed, 1 deletion(-)

diff -puN arch/i386/kernel/acpi/boot.c~x86_64-vect-share-build-fix arch/i386/kernel/acpi/boot.c
--- devel/arch/i386/kernel/acpi/boot.c~x86_64-vect-share-build-fix	2005-10-14 17:16:54.000000000 -0700
+++ devel-akpm/arch/i386/kernel/acpi/boot.c	2005-10-14 17:16:54.000000000 -0700
@@ -58,7 +58,6 @@ static inline int acpi_madt_oem_check(ch
 #include <mach_mpparse.h>
 #endif				/* CONFIG_X86_LOCAL_APIC */
 
-static inline int ioapic_setup_disabled(void) { return 0; }
 static inline int gsi_irq_sharing(int gsi) { return gsi; }
 
 #endif				/* X86 */
_