linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-i386 / acpi.h

diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h
index 20f5239..55059ab 100644 (file)
--- a/include/asm-i386/acpi.h
+++ b/include/asm-i386/acpi.h
@@ -103,12 +103,6 @@ __acpi_release_global_lock (unsigned int *lock)
         :"=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;
@@ -134,6 +128,8 @@ extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
 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;
@@ -146,6 +142,8 @@ static inline int ioapic_setup_disabled(void)
 
 #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; }