git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
setup-common.c
diff --git
a/arch/powerpc/kernel/setup-common.c
b/arch/powerpc/kernel/setup-common.c
index
db540ea
..
61a3f41
100644
(file)
--- a/
arch/powerpc/kernel/setup-common.c
+++ b/
arch/powerpc/kernel/setup-common.c
@@
-500,6
+500,7
@@
void __init smp_setup_cpu_sibling_map(void)
}
#endif /* CONFIG_SMP */
}
#endif /* CONFIG_SMP */
+#ifdef CONFIG_PCSPKR_PLATFORM
static __init int add_pcspkr(void)
{
struct device_node *np;
static __init int add_pcspkr(void)
{
struct device_node *np;
@@
-522,6
+523,7
@@
static __init int add_pcspkr(void)
return ret;
}
device_initcall(add_pcspkr);
return ret;
}
device_initcall(add_pcspkr);
+#endif /* CONFIG_PCSPKR_PLATFORM */
void probe_machine(void)
{
void probe_machine(void)
{