From: Jarkko Nikula <jarkko.nikula@nokia.com>
Date: Thu, 28 Feb 2008 11:35:25 +0000 (+0100)
Subject: [ALSA] ASoC: Fix WM9712 mixer_event DAPM widget function type
X-Git-Tag: v2.6.25-rc4~142^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3fffe871b93f957bea443e85f6b221c50bbf9f97;p=linux-2.6-omap-h63xx.git

[ALSA] ASoC: Fix WM9712 mixer_event DAPM widget function type

Add kcontrol argument to function since the API was changed by the commit
9af6d9562414568ecadf96aaef5b88e7e8b19821.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 590baea3c4c..524f7450804 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -176,7 +176,8 @@ static int wm9712_add_controls(struct snd_soc_codec *codec)
  * the codec only has a single control that is shared by both channels.
  * This makes it impossible to determine the audio path.
  */
-static int mixer_event (struct snd_soc_dapm_widget *w, int event)
+static int mixer_event(struct snd_soc_dapm_widget *w,
+	struct snd_kcontrol *k, int event)
 {
 	u16 l, r, beep, line, phone, mic, pcm, aux;