summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPiotr Kaczuba <pepe@attika.ath.cx>2006-06-26 13:59:38 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 19:48:21 +0200
commit9c63f8738734eb7e6d3f76ca03186f16ef88edf5 (patch)
treecebc6fd2410b9db4cbb9984e68c1841761edeaa5 /arch
parent[PATCH] x86_64: remove sys32_ni_syscall() (diff)
downloadlinux-9c63f8738734eb7e6d3f76ca03186f16ef88edf5.tar.xz
linux-9c63f8738734eb7e6d3f76ca03186f16ef88edf5.zip
[PATCH] x86_64: Fix modular pc speaker
It turned out that the following change is needed when the speaker is compiled as a module. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 8ade23d7ae76..0d2d4f67aa73 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/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)
{