diff --git a/[refs] b/[refs] index ffb6b80f0e44..e4905a898c10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66671fc120938c740edf8bb8191262fdf893441b +refs/heads/master: 5bf2b52fbe71ee2963ee5f0dbec45bb560364adf diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h index 1fc52023a3d6..4d92d690218f 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h +++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h @@ -988,8 +988,6 @@ extern int write_to_file(dhd_pub_t *dhd, u8 *buf, int size); #if defined(OOB_INTR_ONLY) extern int dhd_customer_oob_irq_map(unsigned long *irq_flags_ptr); #endif /* defined(OOB_INTR_ONLY) */ -extern void dhd_os_sdtxlock(dhd_pub_t *pub); -extern void dhd_os_sdtxunlock(dhd_pub_t *pub); int setScheduler(struct task_struct *p, int policy, struct sched_param *param); diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 9c9b8baeb7d9..d7f7449cf30f 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -2603,16 +2603,6 @@ void dhd_os_sdunlock_rxq(dhd_pub_t *pub) { } -void dhd_os_sdtxlock(dhd_pub_t *pub) -{ - dhd_os_sdlock(pub); -} - -void dhd_os_sdtxunlock(dhd_pub_t *pub) -{ - dhd_os_sdunlock(pub); -} - static int dhd_wl_host_event(dhd_info_t *dhd, int *ifidx, void *pktdata, wl_event_msg_t *event, void **data)