diff --git a/[refs] b/[refs]
index e91e1dc27821..c7c15f70173d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7890ba8c87604ca4c2c73f7de846bf5305d743e4
+refs/heads/master: 5cdc5e9e69d4dc3a3630ae1fa666401b2a8dcde6
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;
 	}