Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228242
b: refs/heads/master
c: 954c7a6
h: refs/heads/master
v: v3
  • Loading branch information
Brett Rudley authored and Greg Kroah-Hartman committed Dec 1, 2010
1 parent ea6d5f8 commit 147ddd7
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b834517572d19d34c9cd9adb878aec3138db9224
refs/heads/master: 954c7a6c960bcedf28e8b5dcdcd6fe68d8c6c110
3 changes: 0 additions & 3 deletions trunk/drivers/staging/brcm80211/include/linux_osl.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ extern uint osl_dma_map(struct osl_info *osh, void *va, uint size,
extern void osl_dma_unmap(struct osl_info *osh, uint pa, uint size,
int direction);

/* API for DMA addressing capability */
#define OSL_DMADDRWIDTH(osh, addrwidth) do {} while (0)

/* register access macros */
#if defined(BCMSDIO)
#ifdef BRCM_FULLMAC
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/staging/brcm80211/sys/wlc_bmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,6 @@ static bool wlc_bmac_attach_dmapio(wlc_info_t *wlc, uint j, bool wme)
*/
addrwidth =
dma_addrwidth(wlc_hw->sih, DMAREG(wlc_hw, DMA_TX, 0));
OSL_DMADDRWIDTH(osh, addrwidth);

if (!wl_alloc_dma_resources(wlc_hw->wlc->wl, addrwidth)) {
WL_ERROR(("wl%d: wlc_attach: alloc_dma_resources failed\n", unit));
Expand Down

0 comments on commit 147ddd7

Please sign in to comment.