---

yaml --- r: 101639 b: refs/heads/master c: d33b78d h: refs/heads/master i: 101637: 73faa2c 101635: b3e43ec 101631: ce916a4 v: v3
git-mirror · Jun 9, 2008 · 8b5d3a4 · 8b5d3a4
1 parent 6f3baf2
commit 8b5d3a4
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: bacd73ae76c310bc3c71d21a2864746fd9696d3c
+refs/heads/master: d33b78df142177d51de0ed0c4f3e57c8b5e8ff89
diff --git a/trunk/arch/powerpc/kernel/setup-common.c b/trunk/arch/powerpc/kernel/setup-common.c
@@ -500,6 +500,7 @@ void __init smp_setup_cpu_sibling_map(void)
 }
 #endif /* CONFIG_SMP */
 
+#ifdef CONFIG_PCSPKR_PLATFORM
 static __init int add_pcspkr(void)
 {
 	struct device_node *np;
@@ -522,6 +523,7 @@ static __init int add_pcspkr(void)
 	return ret;
 }
 device_initcall(add_pcspkr);
+#endif	/* CONFIG_PCSPKR_PLATFORM */
 
 void probe_machine(void)
 {