summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2008-07-08 19:45:20 +0400
committerJaroslav Kysela <perex@perex.cz>2008-07-10 09:33:01 +0200
commit76d39d0a1947fee4c29976e507fb93188eaa2b38 (patch)
tree2007633c28ed1b689a3f5a21679827d6260a4f7a /sound/soc
parentaf13452820d075cb7153fe155ca796e64038d7e5 (diff)
downloadop-kernel-dev-76d39d0a1947fee4c29976e507fb93188eaa2b38.zip
op-kernel-dev-76d39d0a1947fee4c29976e507fb93188eaa2b38.tar.gz
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 dba7689..b6edb61 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -153,7 +153,7 @@ SND_SOC_DAPM_SPK("Speaker", NULL),
};
/* tosa audio map */
-static const snd_soc_dapm_route audio_map[] = {
+static const struct snd_soc_dapm_route audio_map[] = {
/* headphone connected to HPOUTL, HPOUTR */
{"Headphone Jack", NULL, "HPOUTL"},
@@ -205,7 +205,7 @@ static int tosa_ac97_init(struct snd_soc_codec *codec)
}
/* add tosa specific widgets */
- snd_soc_dapm_new_controls(codec, &tosa_dapm_widgets,
+ snd_soc_dapm_new_controls(codec, tosa_dapm_widgets,
ARRAY_SIZE(tosa_dapm_widgets));
/* set up tosa specific audio path audio_map */
OpenPOWER on IntegriCloud