projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d39159c
)
[PATCH] x86_64: Fix modular pc speaker
author
Piotr Kaczuba
<pepe@attika.ath.cx>
Mon, 26 Jun 2006 11:59:38 +0000
(13:59 +0200)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Mon, 26 Jun 2006 17:48:21 +0000
(10:48 -0700)
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>
arch/x86_64/kernel/setup.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/x86_64/kernel/setup.c
b/arch/x86_64/kernel/setup.c
index 8ade23d7ae76fb62837a53a83c3a871778f8cb9e..0d2d4f67aa73b7b21ee18db4f534cfd746f2adc9 100644
(file)
--- 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,
};
-#if
def CONFIG_INPUT_PCSPKR
+#if
defined(CONFIG_INPUT_PCSPKR) || defined(CONFIG_INPUT_PCSPKR_MODULE)
#include <linux/platform_device.h>
static __init int add_pcspkr(void)
{