diff options
| author | Emil Medve <Emilian.Medve@Freescale.com> | 2008-05-23 08:40:16 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-09 13:42:30 +1000 |
| commit | d33b78df142177d51de0ed0c4f3e57c8b5e8ff89 (patch) | |
| tree | 36e6cdad4b3f90e927f8aa93bbf87b89ede93f8c /arch/powerpc/kernel/setup-common.c | |
| parent | bacd73ae76c310bc3c71d21a2864746fd9696d3c (diff) | |
| download | kernel_samsung_smdk4412-d33b78df142177d51de0ed0c4f3e57c8b5e8ff89.tar.gz kernel_samsung_smdk4412-d33b78df142177d51de0ed0c4f3e57c8b5e8ff89.tar.bz2 kernel_samsung_smdk4412-d33b78df142177d51de0ed0c4f3e57c8b5e8ff89.zip | |
powerpc: Add the PC speaker only when requested
This eliminates this minor boot-time debugging error message:
[ 1.316451] calling add_pcspkr+0x0/0x84
[ 1.316478] initcall add_pcspkr+0x0/0x84 returned -19 after 0 msecs
Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index db540eab09f..61a3f413208 100644 --- 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 */ +#ifdef CONFIG_PCSPKR_PLATFORM 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); +#endif /* CONFIG_PCSPKR_PLATFORM */ void probe_machine(void) { |