From 63f84abcbfe96e1e9c6bb06bacd4d22174d64765 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Thu, 9 Jun 2011 16:44:47 +0200
Subject: [PATCH] --- yaml --- r: 259522 b: refs/heads/master c:
 44c069ec4c2e7c139202487c8ab6949f1d5f30b7 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/bmac.c | 2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/main.c | 2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/main.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e7a2f280d7c1..0beb82d890ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 206c5a43563e960fb0dd8bde37b6ad4fcb9ba679
+refs/heads/master: 44c069ec4c2e7c139202487c8ab6949f1d5f30b7
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/bmac.c b/trunk/drivers/staging/brcm80211/brcmsmac/bmac.c
index e501e06d6aff..68bf242dc99c 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/bmac.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/bmac.c
@@ -327,7 +327,7 @@ bool wlc_dpc(struct wlc_info *wlc, bool bounded)
 	}
 
 	if (macintstatus & (MI_TBTT | MI_DTIM_TBTT))
-		wlc_tbtt(wlc, regs);
+		wlc_tbtt(wlc);
 
 	/* ATIM window end */
 	if (macintstatus & MI_ATIMWINEND) {
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/main.c b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
index 28ae74151702..32447512287e 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
@@ -4243,7 +4243,7 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
 	return 0;
 }
 
-void wlc_tbtt(struct wlc_info *wlc, d11regs_t *regs)
+void wlc_tbtt(struct wlc_info *wlc)
 {
 	struct wlc_bsscfg *cfg = wlc->cfg;
 
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/main.h b/trunk/drivers/staging/brcm80211/brcmsmac/main.h
index 1d28b767c8d6..cc0772e53af3 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/main.h
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/main.h
@@ -932,7 +932,7 @@ extern u16 wlc_compute_rtscts_dur(struct wlc_info *wlc, bool cts_only,
 				     u8 frame_preamble_type, uint frame_len,
 				     bool ba);
 
-extern void wlc_tbtt(struct wlc_info *wlc, d11regs_t *regs);
+extern void wlc_tbtt(struct wlc_info *wlc);
 extern void wlc_inval_dma_pkts(struct wlc_hw_info *hw,
 			       struct ieee80211_sta *sta,
 			       void (*dma_callback_fn));