aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2008-07-08 11:45:20 -0400
committerJaroslav Kysela <perex@perex.cz>2008-07-10 03:33:01 -0400
commit76d39d0a1947fee4c29976e507fb93188eaa2b38 (patch)
tree2007633c28ed1b689a3f5a21679827d6260a4f7a /sound/soc
parentaf13452820d075cb7153fe155ca796e64038d7e5 (diff)
ALSA: tosa: fix compilation with new DAPM API
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/pxa/tosa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index dba7689c5080..b6edb61a3a30 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -153,7 +153,7 @@ SND_SOC_DAPM_SPK("Speaker", NULL),
153}; 153};
154 154
155/* tosa audio map */ 155/* tosa audio map */
156static const snd_soc_dapm_route audio_map[] = { 156static const struct snd_soc_dapm_route audio_map[] = {
157 157
158 /* headphone connected to HPOUTL, HPOUTR */ 158 /* headphone connected to HPOUTL, HPOUTR */
159 {"Headphone Jack", NULL, "HPOUTL"}, 159 {"Headphone Jack", NULL, "HPOUTL"},
@@ -205,7 +205,7 @@ static int tosa_ac97_init(struct snd_soc_codec *codec)
205 } 205 }
206 206
207 /* add tosa specific widgets */ 207 /* add tosa specific widgets */
208 snd_soc_dapm_new_controls(codec, &tosa_dapm_widgets, 208 snd_soc_dapm_new_controls(codec, tosa_dapm_widgets,
209 ARRAY_SIZE(tosa_dapm_widgets)); 209 ARRAY_SIZE(tosa_dapm_widgets));
210 210
211 /* set up tosa specific audio path audio_map */ 211 /* set up tosa specific audio path audio_map */