diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-29 17:50:19 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-29 17:50:19 +0000 |
| commit | 75438517382c13f96dc42070bc67883ba8ddb168 (patch) | |
| tree | e4275b841b4750b3f970e29b3edf08ed663b97f1 /package/linux/kernel-source/drivers | |
| parent | 658e159aa46b16404194b53a0b2580c8575fa006 (diff) | |
add some gcc 4.0 fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@764 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/linux/kernel-source/drivers')
| -rw-r--r-- | package/linux/kernel-source/drivers/net/hnd/bcmutils.c | 2 | ||||
| -rw-r--r-- | package/linux/kernel-source/drivers/net/hnd/sbutils.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/linux/kernel-source/drivers/net/hnd/bcmutils.c b/package/linux/kernel-source/drivers/net/hnd/bcmutils.c index 0b704d41b1..1b37c511e9 100644 --- a/package/linux/kernel-source/drivers/net/hnd/bcmutils.c +++ b/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/package/linux/kernel-source/drivers/net/hnd/sbutils.c b/package/linux/kernel-source/drivers/net/hnd/sbutils.c index 50ec33986d..2c9cb55c79 100644 --- a/package/linux/kernel-source/drivers/net/hnd/sbutils.c +++ b/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) { |