diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-12-04 18:27:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-04 18:27:43 -0500 |
| commit | 2ad657c88d8b3c1f97c1b8cc474b6307ba7f8509 (patch) | |
| tree | 8b2aafc89feaffe5e726cf38f4110a638a776cc7 /drivers/net/smc91x.h | |
| parent | ff51a98799931256b555446b2f5675db08de6229 (diff) | |
| parent | c69fda4e181fe448c43c2e1cc7b3fa67263d88ca (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.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index a8640169fc77..9e0fbc59114f 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
| @@ -1216,7 +1216,7 @@ static const char * chip_ids[ 16 ] = { | |||
| 1216 | if (SMC_CAN_USE_32BIT) { \ | 1216 | if (SMC_CAN_USE_32BIT) { \ |
| 1217 | void *__ptr = (p); \ | 1217 | void *__ptr = (p); \ |
| 1218 | int __len = (l); \ | 1218 | int __len = (l); \ |
| 1219 | void *__ioaddr = ioaddr; \ | 1219 | void __iomem *__ioaddr = ioaddr; \ |
| 1220 | if (__len >= 2 && (unsigned long)__ptr & 2) { \ | 1220 | if (__len >= 2 && (unsigned long)__ptr & 2) { \ |
| 1221 | __len -= 2; \ | 1221 | __len -= 2; \ |
| 1222 | SMC_outw(*(u16 *)__ptr, ioaddr, DATA_REG); \ | 1222 | SMC_outw(*(u16 *)__ptr, ioaddr, DATA_REG); \ |
| @@ -1240,7 +1240,7 @@ static const char * chip_ids[ 16 ] = { | |||
| 1240 | if (SMC_CAN_USE_32BIT) { \ | 1240 | if (SMC_CAN_USE_32BIT) { \ |
| 1241 | void *__ptr = (p); \ | 1241 | void *__ptr = (p); \ |
| 1242 | int __len = (l); \ | 1242 | int __len = (l); \ |
| 1243 | void *__ioaddr = ioaddr; \ | 1243 | void __iomem *__ioaddr = ioaddr; \ |
| 1244 | if ((unsigned long)__ptr & 2) { \ | 1244 | if ((unsigned long)__ptr & 2) { \ |
| 1245 | /* \ | 1245 | /* \ |
| 1246 | * We want 32bit alignment here. \ | 1246 | * We want 32bit alignment here. \ |