Subject: [PATCH 9/12] sound: fix compile error (wrong declaration of devinitdata)

Fix compile error:

CC sound/pci/ice1712/prodigy192.o
sound/pci/ice1712/prodigy192.c:708: error: ak4114_controls causes a section type conflict

... but __initdata cannot be "const".

Signed-off-by: Andreas Herrmann <[email protected]>
---
sound/pci/ice1712/prodigy192.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/pci/ice1712/prodigy192.c b/sound/pci/ice1712/prodigy192.c
index f03c02c..4bae730 100644
--- a/sound/pci/ice1712/prodigy192.c
+++ b/sound/pci/ice1712/prodigy192.c
@@ -705,7 +705,7 @@ static int ak4114_input_sw_put(struct snd_kcontrol *kcontrol,
}


-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",
--
1.5.0.7





2007-06-20 10:57:26

by Takashi Iwai

[permalink] [raw]
Subject: Re: [PATCH 9/12] sound: fix compile error (wrong declaration of devinitdata)

At Wed, 20 Jun 2007 00:51:20 +0200,
Andreas Herrmann wrote:
>
> Fix compile error:
>
> CC sound/pci/ice1712/prodigy192.o
> sound/pci/ice1712/prodigy192.c:708: error: ak4114_controls causes a section type conflict
>
> ... but __initdata cannot be "const".
>
> Signed-off-by: Andreas Herrmann <[email protected]>

Thanks, applied to ALSA tree now.


Takashi