summaryrefslogtreecommitdiff
path: root/openwrt/package/linux/kernel-source/drivers
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-04-29 17:50:19 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-04-29 17:50:19 +0000
commit6fa75d0b231a679a4eff600147a0cfad2d98710e (patch)
treed1d85e8a3d5dd989f01f480817050544e7097f07 /openwrt/package/linux/kernel-source/drivers
parent701eadd194c1fd2eec1a5158929db67422fed7eb (diff)
downloadmtk-20170518-6fa75d0b231a679a4eff600147a0cfad2d98710e.zip
mtk-20170518-6fa75d0b231a679a4eff600147a0cfad2d98710e.tar.gz
mtk-20170518-6fa75d0b231a679a4eff600147a0cfad2d98710e.tar.bz2
add some gcc 4.0 fixes
SVN-Revision: 764
Diffstat (limited to 'openwrt/package/linux/kernel-source/drivers')
-rw-r--r--openwrt/package/linux/kernel-source/drivers/net/hnd/bcmutils.c2
-rw-r--r--openwrt/package/linux/kernel-source/drivers/net/hnd/sbutils.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/openwrt/package/linux/kernel-source/drivers/net/hnd/bcmutils.c b/openwrt/package/linux/kernel-source/drivers/net/hnd/bcmutils.c
index 0b704d4..1b37c51 100644
--- a/openwrt/package/linux/kernel-source/drivers/net/hnd/bcmutils.c
+++ b/openwrt/package/linux/kernel-source/drivers/net/hnd/bcmutils.c
@@ -745,7 +745,7 @@ crc32(
/* handle bulk of data as 32-bit words */
pend = pdata + (nbytes & 0xfffffffc);
while (pdata < pend) {
- *tptr = *((ulong *)pdata)++;
+ *tptr = (*((ulong *)pdata))++;
CRC_INNER_LOOP(32, crc, tmp[0]);
CRC_INNER_LOOP(32, crc, tmp[1]);
CRC_INNER_LOOP(32, crc, tmp[2]);
diff --git a/openwrt/package/linux/kernel-source/drivers/net/hnd/sbutils.c b/openwrt/package/linux/kernel-source/drivers/net/hnd/sbutils.c
index 50ec339..2c9cb55 100644
--- a/openwrt/package/linux/kernel-source/drivers/net/hnd/sbutils.c
+++ b/openwrt/package/linux/kernel-source/drivers/net/hnd/sbutils.c
@@ -136,7 +136,7 @@ sb_read_sbreg(void *sbh, volatile uint32 *sbr)
INTR_OFF(si, intr_val);
tmp = 1;
OSL_PCMCIA_WRITE_ATTR(si->osh, MEM_SEG, &tmp, 1);
- (uint32)sbr &= ~(1 << 11); /* mask out bit 11*/
+ sbr = (uint32 *) (((uint32) sbr) & ~(1 << 11)); /* mask out bit 11*/
}
val = R_REG(sbr);
@@ -170,7 +170,7 @@ sb_write_sbreg(void *sbh, volatile uint32 *sbr, uint32 v)
INTR_OFF(si, intr_val);
tmp = 1;
OSL_PCMCIA_WRITE_ATTR(si->osh, MEM_SEG, &tmp, 1);
- (uint32)sbr &= ~(1 << 11); /* mask out bit 11 */
+ sbr = (uint32 *) (((uint32) sbr) & ~(1 << 11)); /* mask out bit 11*/
}
if (si->bus == PCMCIA_BUS) {