From 79e8201deb0f750d0d41737f6747c498bcae847e Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 19 Apr 2012 13:46:08 +0300
Subject: [PATCH] --- yaml --- r: 303561 b: refs/heads/master c:
 1f6155f5faabb7b99cb7a96abbd52e4bfcbdfc03 h: refs/heads/master i:   303559:
 7e7e019b4f04a1f518575a4b3ec88318304953ce v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/host/bcma-hcd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 385135b728fa..c515e1383790 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d5f89c7b4fa5f8d6dc757982402c032183ffd8d
+refs/heads/master: 1f6155f5faabb7b99cb7a96abbd52e4bfcbdfc03
diff --git a/trunk/drivers/usb/host/bcma-hcd.c b/trunk/drivers/usb/host/bcma-hcd.c
index afec047e4f94..0b35d422fa4e 100644
--- a/trunk/drivers/usb/host/bcma-hcd.c
+++ b/trunk/drivers/usb/host/bcma-hcd.c
@@ -286,7 +286,7 @@ static void bcma_hcd_shutdown(struct bcma_device *dev)
 
 #ifdef CONFIG_PM
 
-static int bcma_hcd_suspend(struct bcma_device *dev, pm_message_t state)
+static int bcma_hcd_suspend(struct bcma_device *dev)
 {
 	bcma_core_disable(dev, 0);