summaryrefslogtreecommitdiffstats
path: root/drivers/staging/brcm80211/util
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2010-10-14 21:26:08 +0200
committerGreg Kroah-Hartman2010-10-14 21:26:08 +0200
commit6ddcfdcf919463469496132731671ebb5f9908e9 (patch)
treefa4e4146e8dbdfb1848e5090787060e67554a2a2 /drivers/staging/brcm80211/util
parentstaging: brcm80211: remove OSL_DELAY (diff)
downloadkernel-qcow2-linux-6ddcfdcf919463469496132731671ebb5f9908e9.tar.gz
kernel-qcow2-linux-6ddcfdcf919463469496132731671ebb5f9908e9.tar.xz
kernel-qcow2-linux-6ddcfdcf919463469496132731671ebb5f9908e9.zip
Staging: brcm80211: fix up compiler warnings I created
I messed up on some of the uintptr conversions, this fixes them up properly. Cc: Brett Rudley <brudley@broadcom.com> Cc: Henry Ptasinski <henryp@broadcom.com> Cc: Nohee Ko <noheek@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/util')
-rw-r--r--drivers/staging/brcm80211/util/aiutils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/brcm80211/util/aiutils.c b/drivers/staging/brcm80211/util/aiutils.c
index b3e2f854bfbf..512f4127ab9a 100644
--- a/drivers/staging/brcm80211/util/aiutils.c
+++ b/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 *)erombase;
+ eromptr = (u32 *)(unsigned long)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 *)addr;
- sii->curwrap = (void *)wrap;
+ sii->curmap = regs = (void *)(unsigned long)addr;
+ sii->curwrap = (void *)(unsigned long)wrap;
break;
default: