]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: tosa: fix compilation with new DAPM API
authorDmitry Baryshkov <dbaryshkov@gmail.com>
Tue, 8 Jul 2008 15:45:20 +0000 (19:45 +0400)
committerJaroslav Kysela <perex@perex.cz>
Thu, 10 Jul 2008 07:33:01 +0000 (09:33 +0200)
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>
sound/soc/pxa/tosa.c

index dba7689c50802d1bde3f95e5ddb10fe114c9078d..b6edb61a3a30f8591e89944d002fb7eff1c253ac 100644 (file)
@@ -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 */