From 432c3f21d0e571fd77944dffed9f06a22eb5c0cf Mon Sep 17 00:00:00 2001
From: Roland Vossen <rvossen@broadcom.com>
Date: Sun, 2 Oct 2011 10:14:26 -0700
Subject: [PATCH] --- yaml --- r: 268630 b: refs/heads/master c:
 3e8eda4447d2c89bcc197f708dd09c18dce4b8ae h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../drivers/staging/brcm80211/brcmfmac/dhd.h  | 29 -------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index 81f758a4cce9..2e01f403f375 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4aa147ac3d0824b37ecdd3d8f7ddba18762c352
+refs/heads/master: 3e8eda4447d2c89bcc197f708dd09c18dce4b8ae
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
index 514f779c63cc..be6c620a7128 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
@@ -683,36 +683,7 @@ struct bcmevent_name {
 	const char *name;
 };
 
-/* Override to force tx queueing all the time */
-extern uint brcmf_force_tx_queueing;
-
 extern const struct bcmevent_name bcmevent_names[];
-extern const int bcmevent_names_size;
-
-
-static inline void MUTEX_LOCK_INIT(struct brcmf_pub *drvr)
-{
-}
-
-static inline void MUTEX_LOCK(struct brcmf_pub *drvr)
-{
-}
-
-static inline void MUTEX_UNLOCK(struct brcmf_pub *drvr)
-{
-}
-
-static inline void MUTEX_LOCK_WL_SCAN_SET_INIT(void)
-{
-}
-
-static inline void MUTEX_LOCK_WL_SCAN_SET(void)
-{
-}
-
-static inline void MUTEX_UNLOCK_WL_SCAN_SET(void)
-{
-}
 
 /* Indication from bus module regarding presence/insertion of dongle.
  * Return struct brcmf_pub pointer, used as handle to OS module in later calls.