---

yaml --- r: 30519 b: refs/heads/master c: 9c63f87 h: refs/heads/master i: 30517: 671fa97 30515: cdd5490 30511: 3aa933b v: v3
git-mirror · Jun 26, 2006 · 9f9fe4a · 9f9fe4a
1 parent e8653ef
commit 9f9fe4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d39159c27fe1375bb7773d364213b1047265022c
+refs/heads/master: 9c63f8738734eb7e6d3f76ca03186f16ef88edf5
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
@@ -1361,7 +1361,7 @@ struct seq_operations cpuinfo_op = {
 	.show =	show_cpuinfo,
 };
 
-#ifdef CONFIG_INPUT_PCSPKR
+#if defined(CONFIG_INPUT_PCSPKR) || defined(CONFIG_INPUT_PCSPKR_MODULE)
 #include <linux/platform_device.h>
 static __init int add_pcspkr(void)
 {