From 3d0abc4c3d5f7238adbec2fff852df0c5d779c3e Mon Sep 17 00:00:00 2001
From: Herbert Poetzl <herbert@13thfloor.at>
Date: Wed, 22 Mar 2006 00:07:34 -0800
Subject: [PATCH] --- yaml --- r: 22420 b: refs/heads/master c:
 152475cb0a65ed73301cfbd7d7afab65536643f7 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/include/asm-i386/acpi.h | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 26b8dc09805a..e98b4dcb665b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9430d58e34ec3861e1ca72f8e49105b227aad327
+refs/heads/master: 152475cb0a65ed73301cfbd7d7afab65536643f7
diff --git a/trunk/include/asm-i386/acpi.h b/trunk/include/asm-i386/acpi.h
index 55059abf9c95..20f523954218 100644
--- a/trunk/include/asm-i386/acpi.h
+++ b/trunk/include/asm-i386/acpi.h
@@ -103,6 +103,12 @@ __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;
@@ -128,8 +134,6 @@ 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;
@@ -142,8 +146,6 @@ 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; }