From e95e801281430f73af55f6db1c06efec774e8b73 Mon Sep 17 00:00:00 2001
From: Brett Rudley <brudley@broadcom.com>
Date: Wed, 29 Sep 2010 17:11:11 -0700
Subject: [PATCH] --- yaml --- r: 220015 b: refs/heads/master c:
 6f0c5bcdff5eec67a8fd5688e604ea1317fd26c8 h: refs/heads/master i:   220013:
 58dd84b336241fe68b965d3a4203d228a8b53eb2   220011:
 5e891f39bd2a09d03ceca38da83f3e48f59b4eb5   220007:
 fc719af56a08dc1208d75498952d9f8bb407de14   219999:
 79be604815d654a172888ec76b414f4d885d56b9 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/brcm80211/sys/wl_mac80211.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e4f4262f9784..342b6e83d98a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84b9fac24ba168ebe5531a820d3ed63f2f3a8935
+refs/heads/master: 6f0c5bcdff5eec67a8fd5688e604ea1317fd26c8
diff --git a/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
index 9063677e8525..941b4a392bde 100644
--- a/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
@@ -181,7 +181,7 @@ static struct pci_device_id wl_id_table[] = {
 };
 
 MODULE_DEVICE_TABLE(pci, wl_id_table);
-static void __devexit wl_remove(struct pci_dev *pdev);
+static void wl_remove(struct pci_dev *pdev);
 #endif				/* !BCMSDIO */
 
 #ifdef BCMSDIO
@@ -1441,7 +1441,7 @@ static int wl_resume(struct pci_dev *pdev)
 }
 #endif				/* LINUXSTA_PS */
 
-static void __devexit wl_remove(struct pci_dev *pdev)
+static void wl_remove(struct pci_dev *pdev)
 {
 	wl_info_t *wl;
 	struct ieee80211_hw *hw;