Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6] / sound / soc / pxa / tosa.c

diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index dba7689c50802d1bde3f95e5ddb10fe114c9078d..b6edb61a3a30f8591e89944d002fb7eff1c253ac 100644 (file)
--- 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 */