From d27ce33b6962658a80a9161d58b87cc34fcec5e5 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 3 Dec 2012 09:56:31 -0500
Subject: [PATCH] --- yaml --- r: 342015 b: refs/heads/master c:
 fcff0c0887f7286eda3ce47d8934acb3a78e1076 h: refs/heads/master i:   342013:
 7fcd14351ca8e251af98a9ec6eba80c00b02203b   342011:
 30450cc2fc66becc71554ccde9289feaef1896b3   342007:
 18edf7e3a8cc11a500a3aa750410d5d2f27c08ba   341999:
 e0b8e32e10648e046454dd8b955133d7f87ab2a1   341983:
 bb058b9d03bfa379596c0fe156b3023341d828c8   341951:
 b92d3eea9041f143fd9d54c104110c3d55427f8f   341887:
 37d4e48455db2f41ef25409736cdaea02998ca04   341759:
 bbd7c7545df1a1a53a7c9e1bc8eaebb034559ca5   341503:
 684d61f3954b15c0949ac06628eaf02cc99028cd   340991:
 e53e95901bc0a8e222ed62784420943811cf0fdc   339967:
 a59e057f8634dc03245ef391cd8791eb8efe6db4 v: v3

---
 [refs]                                                      | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1873466b075b..b840eadb4e7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 157c9436e6e740b0fb3f3c10da0e2f68731a8052
+refs/heads/master: fcff0c0887f7286eda3ce47d8934acb3a78e1076
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 85dbaf8ac997..02d27eacc0e2 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -1099,7 +1099,7 @@ static struct brcms_info *brcms_attach(struct bcma_device *pdev)
  *
  * Perimeter lock is initialized in the course of this function.
  */
-static int __devinit brcms_bcma_probe(struct bcma_device *pdev)
+static int brcms_bcma_probe(struct bcma_device *pdev)
 {
 	struct brcms_info *wl;
 	struct ieee80211_hw *hw;
@@ -1165,7 +1165,7 @@ static struct bcma_driver brcms_bcma_driver = {
 	.probe    = brcms_bcma_probe,
 	.suspend  = brcms_suspend,
 	.resume   = brcms_resume,
-	.remove   = __devexit_p(brcms_remove),
+	.remove   = brcms_remove,
 	.id_table = brcms_coreid_table,
 };