From 7f87ab91a4836ed06ac7adffd33f17b5fe4d7c66 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 12 Oct 2010 13:20:38 -0700
Subject: [PATCH] --- yaml --- r: 220312 b: refs/heads/master c:
 3c2c926823305139ef7867dcffa76b3a505a3b02 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/brcm80211/util/aiutils.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 02ff9aa19c73..7732e4469fd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e88cf8eb62536661d9fae0158e9713c5e4ddc405
+refs/heads/master: 3c2c926823305139ef7867dcffa76b3a505a3b02
diff --git a/trunk/drivers/staging/brcm80211/util/aiutils.c b/trunk/drivers/staging/brcm80211/util/aiutils.c
index 0724cc1d0730..d4e9187508af 100644
--- a/trunk/drivers/staging/brcm80211/util/aiutils.c
+++ b/trunk/drivers/staging/brcm80211/util/aiutils.c
@@ -134,7 +134,7 @@ void ai_scan(si_t *sih, void *regs, uint devid)
 	case SPI_BUS:
 	case SDIO_BUS:
 #endif				/* BCMSDIO */
-		eromptr = (u32 *) (uintptr) erombase;
+		eromptr = (u32 *)erombase;
 		break;
 
 	default:
@@ -358,8 +358,8 @@ void *ai_setcoreidx(si_t *sih, uint coreidx)
 	case SPI_BUS:
 	case SDIO_BUS:
 #endif				/* BCMSDIO */
-		sii->curmap = regs = (void *)((uintptr) addr);
-		sii->curwrap = (void *)((uintptr) wrap);
+		sii->curmap = regs = (void *)addr;
+		sii->curwrap = (void *)wrap;
 		break;
 
 	default: