diff --git a/[refs] b/[refs]
index 4b041970eab0..5cef8cfb811e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b7c38d55587f43bcd2cbce3a98b1c0826982090
+refs/heads/master: 8f5d36ed5bb6e33024619eaee15b7ce2e3d115b3
diff --git a/trunk/arch/x86/kernel/apic.c b/trunk/arch/x86/kernel/apic.c
index 485787955834..9ca12af6c876 100644
--- a/trunk/arch/x86/kernel/apic.c
+++ b/trunk/arch/x86/kernel/apic.c
@@ -1131,7 +1131,9 @@ void __cpuinit setup_local_APIC(void)
 	int i, j;
 
 	if (disable_apic) {
+#ifdef CONFIG_X86_IO_APIC
 		disable_ioapic_setup();
+#endif
 		return;
 	}