diff options
| author | Piotr Kaczuba <pepe@attika.ath.cx> | 2006-06-26 13:59:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 10:48:21 -0700 |
| commit | 9c63f8738734eb7e6d3f76ca03186f16ef88edf5 (patch) | |
| tree | cebc6fd2410b9db4cbb9984e68c1841761edeaa5 /arch/x86_64 | |
| parent | d39159c27fe1375bb7773d364213b1047265022c (diff) | |
| download | blackbird-op-linux-9c63f8738734eb7e6d3f76ca03186f16ef88edf5.tar.gz blackbird-op-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/x86_64')
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 2 |
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) { |
