git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
arch
/
x86_64
/
kernel
/
setup.c
diff --git
a/arch/x86_64/kernel/setup.c
b/arch/x86_64/kernel/setup.c
index
655b919
..
e8d5f84
100644
(file)
--- a/
arch/x86_64/kernel/setup.c
+++ b/
arch/x86_64/kernel/setup.c
@@
-1440,7
+1440,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)
{