diff --git a/[refs] b/[refs] index 5f5f847b3627..ec045668de64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1dc08b7d95817faea5e6a358e22c6185b84163a +refs/heads/master: 5b93a8b8e0514ebacb49a50c67a8846139bcd1bd diff --git a/trunk/drivers/staging/brcm80211/include/linux_osl.h b/trunk/drivers/staging/brcm80211/include/linux_osl.h index 586e652e75c7..0fb6e1c86793 100644 --- a/trunk/drivers/staging/brcm80211/include/linux_osl.h +++ b/trunk/drivers/staging/brcm80211/include/linux_osl.h @@ -291,9 +291,6 @@ extern void *osl_pktget(osl_t *osh, uint len); extern void osl_pktfree(osl_t *osh, void *skb, bool send); #ifdef BRCM_FULLMAC -extern void *osl_pktget_static(osl_t *osh, uint len); -extern void osl_pktfree_static(osl_t *osh, void *skb, bool send); - static inline void * osl_pkt_frmnative(osl_pubinfo_t *osh, struct sk_buff *skb) {