diff --git a/[refs] b/[refs] index 4ade43e171b6..f857672bc915 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23ed011ea97d9df57aeb8762dc690496c33b0a8f +refs/heads/master: dd5be5ea7ed42f41cafa1ce7b1e824f46affda0e diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/main.c b/trunk/drivers/staging/brcm80211/brcmsmac/main.c index 6a0a5d0c7467..d75756d89895 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/main.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/main.c @@ -3258,8 +3258,6 @@ static void brcms_b_reset(struct brcms_hardware *wlc_hw) /* purge the dma rings */ brcms_c_flushqueues(wlc_hw->wlc); - - brcms_c_reset_bmac_done(wlc_hw->wlc); } void brcms_c_reset(struct brcms_c_info *wlc) @@ -8868,10 +8866,6 @@ void brcms_c_pllreq(struct brcms_c_info *wlc, bool set, u32 req_bit) brcms_b_pllreq(wlc->hw, set, req_bit); } -void brcms_c_reset_bmac_done(struct brcms_c_info *wlc) -{ -} - /* check for the particular priority flow control bit being set */ bool brcms_c_txflowcontrol_prio_isset(struct brcms_c_info *wlc, diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/main.h b/trunk/drivers/staging/brcm80211/brcmsmac/main.h index 9e1575c99b96..5a2ec539602d 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/main.h +++ b/trunk/drivers/staging/brcm80211/brcmsmac/main.h @@ -677,7 +677,6 @@ extern int brcms_c_xmtfifo_sz_get(struct brcms_c_info *wlc, uint fifo, extern void brcms_c_write_template_ram(struct brcms_c_info *wlc, int offset, int len, void *buf); extern void brcms_c_pllreq(struct brcms_c_info *wlc, bool set, u32 req_bit); -extern void brcms_c_reset_bmac_done(struct brcms_c_info *wlc); #if defined(BCMDBG) extern void brcms_c_print_rxh(struct d11rxhdr *rxh);