From 147ddd7cd70d2c65f4dbe2bd99b3c7f4e14f78d0 Mon Sep 17 00:00:00 2001
From: Brett Rudley <brudley@broadcom.com>
Date: Tue, 30 Nov 2010 15:22:13 -0800
Subject: [PATCH] --- yaml --- r: 228242 b: refs/heads/master c:
 954c7a6c960bcedf28e8b5dcdcd6fe68d8c6c110 h: refs/heads/master v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/brcm80211/include/linux_osl.h | 3 ---
 trunk/drivers/staging/brcm80211/sys/wlc_bmac.c      | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1cdb25ac68fc..69bda15797be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b834517572d19d34c9cd9adb878aec3138db9224
+refs/heads/master: 954c7a6c960bcedf28e8b5dcdcd6fe68d8c6c110
diff --git a/trunk/drivers/staging/brcm80211/include/linux_osl.h b/trunk/drivers/staging/brcm80211/include/linux_osl.h
index b973f3fea7e2..18bc1f0d2d84 100644
--- a/trunk/drivers/staging/brcm80211/include/linux_osl.h
+++ b/trunk/drivers/staging/brcm80211/include/linux_osl.h
@@ -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
diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_bmac.c b/trunk/drivers/staging/brcm80211/sys/wlc_bmac.c
index d427980aebed..2245a8b25a24 100644
--- a/trunk/drivers/staging/brcm80211/sys/wlc_bmac.c
+++ b/trunk/drivers/staging/brcm80211/sys/wlc_bmac.c
@@ -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));