From 151f6d5d6c7cfe401eb72d722afd302aa11139ad Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Tue, 8 Jul 2008 19:45:20 +0400 Subject: [PATCH] --- yaml --- r: 99179 b: refs/heads/master c: 76d39d0a1947fee4c29976e507fb93188eaa2b38 h: refs/heads/master i: 99177: 9a03d28afb595d296e01416f50a71e5d079a7afe 99175: 62cd2fb6151e04f57462b21a459f499de04eeddd v: v3 --- [refs] | 2 +- trunk/sound/soc/pxa/tosa.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 30f4ca539412..e238430803a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af13452820d075cb7153fe155ca796e64038d7e5 +refs/heads/master: 76d39d0a1947fee4c29976e507fb93188eaa2b38 diff --git a/trunk/sound/soc/pxa/tosa.c b/trunk/sound/soc/pxa/tosa.c index dba7689c5080..b6edb61a3a30 100644 --- a/trunk/sound/soc/pxa/tosa.c +++ b/trunk/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 */