aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/smc91x.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-12-04 18:27:43 -0500
committerJeff Garzik <jeff@garzik.org>2006-12-04 18:27:43 -0500
commit2ad657c88d8b3c1f97c1b8cc474b6307ba7f8509 (patch)
tree8b2aafc89feaffe5e726cf38f4110a638a776cc7 /drivers/net/smc91x.h
parentff51a98799931256b555446b2f5675db08de6229 (diff)
parentc69fda4e181fe448c43c2e1cc7b3fa67263d88ca (diff)
Merge branch 'netdev-2.6.20' of master.kernel.org:/pub/scm/linux/kernel/git/viro/bird into tmp
Diffstat (limited to 'drivers/net/smc91x.h')
-rw-r--r--drivers/net/smc91x.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index a8640169fc7..9e0fbc59114 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -1216,7 +1216,7 @@ static const char * chip_ids[ 16 ] = {
if (SMC_CAN_USE_32BIT) { \
void *__ptr = (p); \
int __len = (l); \
- void *__ioaddr = ioaddr; \
+ void __iomem *__ioaddr = ioaddr; \
if (__len >= 2 && (unsigned long)__ptr & 2) { \
__len -= 2; \
SMC_outw(*(u16 *)__ptr, ioaddr, DATA_REG); \
@@ -1240,7 +1240,7 @@ static const char * chip_ids[ 16 ] = {
if (SMC_CAN_USE_32BIT) { \
void *__ptr = (p); \
int __len = (l); \
- void *__ioaddr = ioaddr; \
+ void __iomem *__ioaddr = ioaddr; \
if ((unsigned long)__ptr & 2) { \
/* \
* We want 32bit alignment here. \