Re: [patch][resend2] pcspkr: fix dependancies

From: Takashi Iwai
Date: Mon May 05 2008 - 07:02:55 EST


At Mon, 05 May 2008 09:02:38 +0400,
Stas Sergeev wrote:
>
> --- a/arch/x86/kernel/Makefile 2008-04-26 13:40:06.000000000 +0400
> +++ b/arch/x86/kernel/Makefile 2008-04-26 18:22:49.000000000 +0400
> @@ -83,7 +83,7 @@
> obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o
> obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o
>
> -ifdef CONFIG_INPUT_PCSPKR
> +ifdef CONFIG_PCSPKR_PLATFORM
> obj-y += pcspeaker.o
> endif

This could be replaced now better with

obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o

without if-endif since CONFIG_PCSPKR_PLATFORM is a bool.

> --- a/sound/drivers/Kconfig 2008-04-26 13:40:21.000000000 +0400
> +++ b/sound/drivers/Kconfig 2008-04-26 18:24:59.000000000 +0400
> @@ -5,8 +5,8 @@
>
>
> config SND_PCSP
> - tristate "Internal PC speaker support"
> - depends on X86_PC && HIGH_RES_TIMERS
> + tristate "PC-Speaker support"
> + depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
> help
> If you don't have a sound card in your computer, you can include a
> driver for the PC speaker which allows it to act like a primitive
> --- a/drivers/input/misc/Kconfig 2008-04-22 20:50:41.000000000 +0400
> +++ b/drivers/input/misc/Kconfig 2008-04-26 18:23:32.000000000 +0400
> @@ -14,7 +14,7 @@
>
> config INPUT_PCSPKR
> tristate "PC Speaker support"
> - depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
> + depends on PCSPKR_PLATFORM
> help
> Say Y here if you want the standard PC Speaker to be used for
> bells and whistles.

These two chunks don't apply on 2.6.26-git tree. Please recreate the
patch.


thanks,

Takashi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/