Merge branch 'for-3.2' into for-3.3

[deliverable/linux.git] / sound / soc / codecs / wm8737.c

diff --git a/sound/soc/codecs/wm8737.c b/sound/soc/codecs/wm8737.c
index c13e4f7809cfd17632e34bd56d5a44a6a2f41d99..ff95e62c56b9a7ae211c3f2d508d9cff94132931 100644 (file)
--- a/sound/soc/codecs/wm8737.c
+++ b/sound/soc/codecs/wm8737.c
@@ -539,7 +539,7 @@ static struct snd_soc_dai_driver wm8737_dai = {
 };
 
 #ifdef CONFIG_PM
-static int wm8737_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8737_suspend(struct snd_soc_codec *codec)
 {
        wm8737_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;