---

yaml --- r: 136449 b: refs/heads/master c: 5cdc5e9 h: refs/heads/master i: 136447: bca31b9 v: v3
git-mirror · Jan 19, 2009 · 93d0612 · 93d0612
1 parent 711ade4
commit 93d0612
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;
 	}