---

yaml --- r: 342015 b: refs/heads/master c: fcff0c0 h: refs/heads/master i: 342013: 7fcd143 342011: 30450cc 342007: 18edf7e 341999: e0b8e32 341983: bb058b9 341951: b92d3ee 341887: 37d4e48 341759: bbd7c75 341503: 684d61f 340991: e53e959 339967: a59e057 v: v3
git-mirror · Dec 6, 2012 · d27ce33 · d27ce33
1 parent 6be6eec
commit d27ce33
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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,
 };