From ee2987591ca915a1a5e1cfafeecaa4bc8e17b050 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 29 Jun 2009 16:29:06 +0100
Subject: [PATCH] --- yaml --- r: 157529 b: refs/heads/master c:
 9ea21ebca1a1c4caf3bdaecb0879034107cac1e9 h: refs/heads/master i:   157527:
 7835501f0505157f92f749bdcb2f411312c1ca76 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8961.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 68f8762bff7f..fa7759675292 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2caa4da46a41899b29f90ec30ef3ba86665b334
+refs/heads/master: 9ea21ebca1a1c4caf3bdaecb0879034107cac1e9
diff --git a/trunk/sound/soc/codecs/wm8961.c b/trunk/sound/soc/codecs/wm8961.c
index 1af2d10702f4..bd1af92a122f 100644
--- a/trunk/sound/soc/codecs/wm8961.c
+++ b/trunk/sound/soc/codecs/wm8961.c
@@ -1268,7 +1268,7 @@ static __devexit int wm8961_i2c_remove(struct i2c_client *client)
 }
 
 #ifdef CONFIG_PM
-static int wm8961_i2c_suspend(struct i2c_client *client)
+static int wm8961_i2c_suspend(struct i2c_client *client, pm_message_t state)
 {
 	return snd_soc_suspend_device(&client->dev);
 }