diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2007-06-27 17:09:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-28 14:34:53 -0400 |
| commit | 53f3bed0a46c786b17f040005b1bd7a78ddd0770 (patch) | |
| tree | 2a65d3969f11fed23f735b8b082cf85376fc8887 /sound | |
| parent | 92504f79a7c57b853dfb59595fd2860282f6ba1e (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ice1712/prodigy192.c b/sound/pci/ice1712/prodigy192.c index f03c02c07743..4bae7305a79b 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, | |||
| 705 | } | 705 | } |
| 706 | 706 | ||
| 707 | 707 | ||
| 708 | static const struct snd_kcontrol_new ak4114_controls[] __devinitdata = { | 708 | static struct snd_kcontrol_new ak4114_controls[] __devinitdata = { |
| 709 | { | 709 | { |
| 710 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 710 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 711 | .name = "MIODIO IEC958 Capture Input", | 711 | .name = "MIODIO IEC958 Capture Input", |