[ALSA] ASoC: Fix DAPM widget function types in pxa machine drivers

[deliverable/linux.git] / sound / soc / pxa / corgi.c

diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index 5ee51a994ac3570752cc9ed081acdb6b6bb7841c..1a70a6ac98ced1a2a9a5830e7a5678df8bea7b36 100644 (file)
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -22,7 +22,6 @@
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
@@ -216,7 +215,8 @@ static int corgi_set_spk(struct snd_kcontrol *kcontrol,
        return 1;
 }
 
-static int corgi_amp_event(struct snd_soc_dapm_widget *w, int event)
+static int corgi_amp_event(struct snd_soc_dapm_widget *w,
+       struct snd_kcontrol *k, int event)
 {
        if (SND_SOC_DAPM_EVENT_ON(event))
                set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_APM_ON);
@@ -226,7 +226,8 @@ static int corgi_amp_event(struct snd_soc_dapm_widget *w, int event)
        return 0;
 }
 
-static int corgi_mic_event(struct snd_soc_dapm_widget *w, int event)
+static int corgi_mic_event(struct snd_soc_dapm_widget *w,
+       struct snd_kcontrol *k, int event)
 {
        if (SND_SOC_DAPM_EVENT_ON(event))
                set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MIC_BIAS);