Re: linux-next: Tree for November 20 (snd_jack)

From: Takashi Iwai
Date: Sat Nov 21 2009 - 14:02:56 EST


At Fri, 20 Nov 2009 11:34:41 -0800,
Randy Dunlap wrote:
>
> On Fri, 20 Nov 2009 20:21:03 +0100 Takashi Iwai wrote:
>
> > At Fri, 20 Nov 2009 20:15:31 +0100,
> > I wrote:
> > >
> > > At Fri, 20 Nov 2009 10:40:30 -0800,
> > > Randy Dunlap wrote:
> > > >
> > > > On Fri, 20 Nov 2009 23:05:13 +1100 Stephen Rothwell wrote:
> > > >
> > > > > Hi all,
> > > > >
> > > > > Changes since 20091119:
> > > >
> > > >
> > > > This commit in linux-next-20091120:
> > > >
> > > > author Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
> > > > Mon, 28 Jul 2008 18:05:36 +0000 (19:05 +0100)
> > > > committer Jaroslav Kysela <perex@xxxxxxxx>
> > > > Tue, 29 Jul 2008 19:32:06 +0000 (21:32 +0200)
> > > > commit 0d94e41abe271c86df06bcf72d24f9ca7ce771f0
> > > >
> > > > causes build errors when:
> > > >
> > > > CONFIG_INPUT=m
> > > > CONFIG_SND=y
> > > > CONFIG_SND_JACK=y
> > > > CONFIG_SND_SOC=m
> > > > CONFIG_SND_HDA_INTEL=m
> > > > CONFIG_SND_HDA_INPUT_JACK=y
> > >
> > > The problem isn't the commit above (it's over a year ago!), but the
> > > recent change of hda input layer.
>
> Ack, sorry about that.
>
> > > Will take a look at later. Thanks.
> >
> > Does the patch below work?
> >
>
> Yes, it does, thanks.

Thanks for confirmation! I applied the fix now.


Takashi

>
> >
> > thanks,
> >
> > Takashi
> >
> > ---
> > diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
> > index 25ae10e..556cff9 100644
> > --- a/sound/pci/hda/Kconfig
> > +++ b/sound/pci/hda/Kconfig
> > @@ -51,7 +51,7 @@ config SND_HDA_INPUT_BEEP_MODE
> >
> > config SND_HDA_INPUT_JACK
> > bool "Support jack plugging notification via input layer"
> > - depends on INPUT=y || INPUT=SND_HDA_INTEL
> > + depends on INPUT=y || INPUT=SND
> > select SND_JACK
> > help
> > Say Y here to enable the jack plugging notification via
>
>
> ---
> ~Randy
>
--
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/