Commit d33b78df142177d51de0ed0c4f3e57c8b5e8ff89
Committed by
Paul Mackerras
1 parent
bacd73ae76
Exists in
master
and in
7 other branches
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>
Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff
arch/powerpc/kernel/setup-common.c
... | ... | @@ -500,6 +500,7 @@ |
500 | 500 | } |
501 | 501 | #endif /* CONFIG_SMP */ |
502 | 502 | |
503 | +#ifdef CONFIG_PCSPKR_PLATFORM | |
503 | 504 | static __init int add_pcspkr(void) |
504 | 505 | { |
505 | 506 | struct device_node *np; |
... | ... | @@ -522,6 +523,7 @@ |
522 | 523 | return ret; |
523 | 524 | } |
524 | 525 | device_initcall(add_pcspkr); |
526 | +#endif /* CONFIG_PCSPKR_PLATFORM */ | |
525 | 527 | |
526 | 528 | void probe_machine(void) |
527 | 529 | { |