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

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

diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 0915cf740421a809c69e35db07c577a28c78fdab..4fbf8bba9627322cd628fb8d21d545ebe608c658 100644 (file)
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -19,7 +19,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>
@@ -197,7 +196,8 @@ static int poodle_set_spk(struct snd_kcontrol *kcontrol,
        return 1;
 }
 
-static int poodle_amp_event(struct snd_soc_dapm_widget *w, int event)
+static int poodle_amp_event(struct snd_soc_dapm_widget *w,
+       struct snd_kcontrol *k, int event)
 {
        if (SND_SOC_DAPM_EVENT_ON(event))
                locomo_gpio_write(&poodle_locomo_device.dev,