Re: [patch 03/45] x86_64: Fix modular pc speaker

Dmitry Torokhov
2006-07-17T18:02:36Z

On 7/17/06, Greg KH <gregkh@suse.de> wrote:
> -stable review patch. If anyone has any objections, please let us know.
>
> ------------------
> 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>
> Signed-off-by: Chris Wright <chrisw@sous-sol.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
> ---
> arch/x86_64/kernel/setup.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- linux-2.6.17.2.orig/arch/x86_64/kernel/setup.c
> +++ linux-2.6.17.2/arch/x86_64/kernel/setup.c
> @@ -1440,7 +1440,7 @@ struct seq_operations cpuinfo_op = {
> .show = show_cpuinfo,
> };
>
> -#ifdef CONFIG_INPUT_PCSPKR
> +#if defined(CONFIG_INPUT_PCSPKR) || defined(CONFIG_INPUT_PCSPKR_MODULE)
> #include <linux/platform_device.h>
> static __init int add_pcspkr(void)
> {

Why have this #ifdefed at all? The device is there regardless of
whether PCSPKR driver is selected and teoretically one could use an
alternative driver to speak to the hardware or decide to add pcspkr
driver later.

--
Dmitry