Re: [PATCH] ALSA: fix ice1712 section mismatch

[Takashi Iwai <tiwai@suse.de>]

At Mon, 25 Jun 2007 16:41:10 -0700,
Andrew Morton wrote:
> 
> On Mon, 25 Jun 2007 16:17:39 -0700 Randy Dunlap <randy.dunlap@oracle.com>
> wrote:
> 
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> > 
> > Cannot mix const and __initdata:
> > sound/pci/ice1712/prodigy192.c:708: error: ak4114_controls causes a section type conflict
> > 
> 
> This is a fatal compilation error, isn't it?
> 
> > ---
> >  sound/pci/ice1712/prodigy192.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > --- linux-2.6.22-rc6.orig/sound/pci/ice1712/prodigy192.c
> > +++ linux-2.6.22-rc6/sound/pci/ice1712/prodigy192.c
> > @@ -705,7 +705,7 @@ static int ak4114_input_sw_put(struct sn
> >  }
> >  
> >  
> > -static const struct snd_kcontrol_new ak4114_controls[] __devinitdata = {
> > +static struct snd_kcontrol_new ak4114_controls[] __devinitdata = {
> >  	{
> >  		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
> >  		.name = "MIODIO IEC958 Capture Input",
> 
> That patch is already in the alsa git tree (has been there for five days),
> so I would of course prefer that the alsa guys merge it into 2.6.22.

Jaroslav, could you prepare the push?


> However alsa merges are a bit spotty, so I'll queue this up anyway and will
> merge it in a day or three if nothing else happens, OK?

Yes, I think it's perhaps an easier path...


Thanks!

Takashi