summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2007-06-27 14:09:57 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-28 11:34:53 -0700
commit53f3bed0a46c786b17f040005b1bd7a78ddd0770 (patch)
tree2a65d3969f11fed23f735b8b082cf85376fc8887 /sound
parent92504f79a7c57b853dfb59595fd2860282f6ba1e (diff)
downloadop-kernel-dev-53f3bed0a46c786b17f040005b1bd7a78ddd0770.zip
op-kernel-dev-53f3bed0a46c786b17f040005b1bd7a78ddd0770.tar.gz
ALSA: fix ice1712 section mismatch
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> Cc: Jaroslav Kysela <perex@suse.cz> Cc: Takashi Iwai <tiwai@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/ice1712/prodigy192.c2
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",
OpenPOWER on IntegriCloud