From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Date: Tue, 8 Jul 2008 15:45:20 +0000 (+0400)
Subject: ALSA: tosa: fix compilation with new DAPM API
X-Git-Tag: v2.6.27-rc1~1111^2~15
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=76d39d0a1947fee4c29976e507fb93188eaa2b38;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index dba7689c508..b6edb61a3a3 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 */