From 2d4318362be67d4427090230adce7bcd691e91ba Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 18 Jun 2008 14:47:09 +0200
Subject: [PATCH] --- yaml --- r: 120897 b: refs/heads/master c:
 33be8333421f842789fa7e363ce4142947e094f0 h: refs/heads/master i:   120895:
 c99358f3693fd0c2340346211376fb6e43999ab2 v: v3

---
 [refs]                          | 2 +-
 trunk/include/asm-x86/io_apic.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2e5c5dec03f7..229149e7970b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1d3a90846b40ad3160bf4b648d36c6badad39ac
+refs/heads/master: 33be8333421f842789fa7e363ce4142947e094f0
diff --git a/trunk/include/asm-x86/io_apic.h b/trunk/include/asm-x86/io_apic.h
index a39670ae17df..721605d8f116 100644
--- a/trunk/include/asm-x86/io_apic.h
+++ b/trunk/include/asm-x86/io_apic.h
@@ -168,8 +168,10 @@ extern int timer_through_8259;
 
 static inline void disable_ioapic_setup(void)
 {
+#ifdef CONFIG_PCI
 	noioapicquirk = 1;
 	noioapicreroute = -1;
+#endif
 	skip_ioapic_setup = 1;
 }