From 233171d3fc2f1c27acc3717581df44f4ceee8ee0 Mon Sep 17 00:00:00 2001
From: Barry Song <barry.song@analog.com>
Date: Sat, 20 Jun 2009 11:29:57 -0400
Subject: [PATCH] --- yaml --- r: 153974 b: refs/heads/master c:
 92a6ad34282f8403c4eb83025a2790af86cdb6bd h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/sound/soc/blackfin/bf5xx-i2s.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2561731e75d3..426534d89c80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 895c9c056591f05ba3b669cda6c12afb212c6253
+refs/heads/master: 92a6ad34282f8403c4eb83025a2790af86cdb6bd
diff --git a/trunk/sound/soc/blackfin/bf5xx-i2s.c b/trunk/sound/soc/blackfin/bf5xx-i2s.c
index 0e8af48650be..af06904bab0f 100644
--- a/trunk/sound/soc/blackfin/bf5xx-i2s.c
+++ b/trunk/sound/soc/blackfin/bf5xx-i2s.c
@@ -249,8 +249,7 @@ static int bf5xx_i2s_suspend(struct snd_soc_dai *dai)
 	return 0;
 }
 
-static int bf5xx_i2s_resume(struct platform_device *pdev,
-			    struct snd_soc_dai *dai)
+static int bf5xx_i2s_resume(struct snd_soc_dai *dai)
 {
 	int ret;
 	struct sport_device *sport =