Merge branch 'for-3.2' into for-3.3

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

diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index 6b0f0e220f85466ac1334f4483cdcd73e676c3f1..c7a61fbdae4bef13549ffa7a7b3bda495878c277 100644 (file)
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -1460,7 +1460,7 @@ static int dac33_soc_remove(struct snd_soc_codec *codec)
        return 0;
 }
 
-static int dac33_soc_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int dac33_soc_suspend(struct snd_soc_codec *codec)
 {
        dac33_set_bias_level(codec, SND_SOC_BIAS_OFF);