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; }