From: Herbert Poetzl check_acpi_pci() is called from arch/i386/kernel/setup.c even if CONFIG_ACPI is not defined, but the code in include/asm/acpi.h doesn't provide it in this case. Signed-off-by: Herbert Pötzl Cc: "Brown, Len" Signed-off-by: Andrew Morton --- include/asm-i386/acpi.h | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff -puN include/asm-i386/acpi.h~dont-check_acpi_pci-on-x86-with-acpi-disabled include/asm-i386/acpi.h --- devel/include/asm-i386/acpi.h~dont-check_acpi_pci-on-x86-with-acpi-disabled 2006-03-14 18:04:14.000000000 -0800 +++ devel-akpm/include/asm-i386/acpi.h 2006-03-14 18:07:06.000000000 -0800 @@ -103,6 +103,12 @@ __acpi_release_global_lock (unsigned int :"=r"(n_hi), "=r"(n_lo) \ :"0"(n_hi), "1"(n_lo)) +#ifdef CONFIG_X86_IO_APIC +extern void check_acpi_pci(void); +#else +static inline void check_acpi_pci(void) { } +#endif + #ifdef CONFIG_ACPI extern int acpi_lapic; extern int acpi_ioapic; @@ -128,8 +134,6 @@ extern int acpi_gsi_to_irq(u32 gsi, unsi extern int skip_ioapic_setup; extern int acpi_skip_timer_override; -extern void check_acpi_pci(void); - static inline void disable_ioapic_setup(void) { skip_ioapic_setup = 1; @@ -142,8 +146,6 @@ static inline int ioapic_setup_disabled( #else static inline void disable_ioapic_setup(void) { } -static inline void check_acpi_pci(void) { } - #endif static inline void acpi_noirq_set(void) { acpi_noirq = 1; } _