* [PATCH] ALSA: fix ice1712 section mismatch
@ 2007-06-25 23:17 Randy Dunlap
2007-06-25 23:41 ` Andrew Morton
0 siblings, 1 reply; 4+ messages in thread
From: Randy Dunlap @ 2007-06-25 23:17 UTC (permalink / raw)
To: lkml; +Cc: perex, akpm
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
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
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",
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ALSA: fix ice1712 section mismatch
2007-06-25 23:17 [PATCH] ALSA: fix ice1712 section mismatch Randy Dunlap
@ 2007-06-25 23:41 ` Andrew Morton
2007-06-25 23:47 ` Randy Dunlap
2007-06-26 9:10 ` Takashi Iwai
0 siblings, 2 replies; 4+ messages in thread
From: Andrew Morton @ 2007-06-25 23:41 UTC (permalink / raw)
To: Randy Dunlap; +Cc: lkml, perex, Takashi Iwai
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.
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?
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ALSA: fix ice1712 section mismatch
2007-06-25 23:41 ` Andrew Morton
@ 2007-06-25 23:47 ` Randy Dunlap
2007-06-26 9:10 ` Takashi Iwai
1 sibling, 0 replies; 4+ messages in thread
From: Randy Dunlap @ 2007-06-25 23:47 UTC (permalink / raw)
To: Andrew Morton; +Cc: lkml, perex, Takashi Iwai
On 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?
Yes.
> > ---
> > 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.
OK, I admit that I never look there.
> 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?
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ALSA: fix ice1712 section mismatch
2007-06-25 23:41 ` Andrew Morton
2007-06-25 23:47 ` Randy Dunlap
@ 2007-06-26 9:10 ` Takashi Iwai
1 sibling, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2007-06-26 9:10 UTC (permalink / raw)
To: Andrew Morton; +Cc: Randy Dunlap, lkml, perex
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-06-26 9:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-25 23:17 [PATCH] ALSA: fix ice1712 section mismatch Randy Dunlap
2007-06-25 23:41 ` Andrew Morton
2007-06-25 23:47 ` Randy Dunlap
2007-06-26 9:10 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.