diff --git a/[refs] b/[refs] index 6107cc1d1b7b..3c032545d18f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 069f4439b9a05902999e49c37d3fe5f83523089d +refs/heads/master: d7918e6c65b4eb1453e5c07308eb37f091d714bb diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c index 021384441cb9..b56d613f725b 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c @@ -7868,11 +7868,6 @@ void wlc_set_rcmta(struct wlc_info *wlc, int idx, const u8 *addr) wlc_bmac_set_rcmta(wlc->hw, idx, addr); } -void wlc_read_tsf(struct wlc_info *wlc, u32 *tsf_l_ptr, u32 *tsf_h_ptr) -{ - wlc_bmac_read_tsf(wlc->hw, tsf_l_ptr, tsf_h_ptr); -} - void wlc_set_cwmin(struct wlc_info *wlc, u16 newmin) { wlc->band->CWmin = newmin; diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.h b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.h index 4f0db6cd8078..23130bb6d7b4 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.h +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.h @@ -813,8 +813,6 @@ extern void wlc_get_rcmta(struct wlc_info *wlc, int idx, #endif extern void wlc_set_rcmta(struct wlc_info *wlc, int idx, const u8 *addr); -extern void wlc_read_tsf(struct wlc_info *wlc, u32 *tsf_l_ptr, - u32 *tsf_h_ptr); extern void wlc_set_cwmin(struct wlc_info *wlc, u16 newmin); extern void wlc_set_cwmax(struct wlc_info *wlc, u16 newmax); extern void wlc_fifoerrors(struct wlc_info *wlc);