diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-10-14 19:36:10 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-14 12:41:52 -0700 |
| commit | eb4d84f18598211ccfdecc0a7f14a048cb86e657 (patch) | |
| tree | 0baff9c1bd5a93a85c014292d940e8db6e9bd719 /drivers/net/ibm_newemac/zmii.c | |
| parent | c6b44e50b8958d9bfe3003c81e70d9a53852ae52 (diff) | |
| download | linux-eb4d84f18598211ccfdecc0a7f14a048cb86e657.tar.gz linux-eb4d84f18598211ccfdecc0a7f14a048cb86e657.tar.bz2 linux-eb4d84f18598211ccfdecc0a7f14a048cb86e657.zip | |
ibm_newemac annotations (iomem, NULL noise)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/ibm_newemac/zmii.c')
| -rw-r--r-- | drivers/net/ibm_newemac/zmii.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ibm_newemac/zmii.c index d06312901848..2219ec2740e0 100644 --- a/drivers/net/ibm_newemac/zmii.c +++ b/drivers/net/ibm_newemac/zmii.c @@ -79,7 +79,7 @@ static inline u32 zmii_mode_mask(int mode, int input) int __devinit zmii_attach(struct of_device *ofdev, int input, int *mode) { struct zmii_instance *dev = dev_get_drvdata(&ofdev->dev); - struct zmii_regs *p = dev->base; + struct zmii_regs __iomem *p = dev->base; ZMII_DBG(dev, "init(%d, %d)" NL, input, *mode); @@ -250,7 +250,7 @@ static int __devinit zmii_probe(struct of_device *ofdev, } rc = -ENOMEM; - dev->base = (struct zmii_regs *)ioremap(regs.start, + dev->base = (struct zmii_regs __iomem *)ioremap(regs.start, sizeof(struct zmii_regs)); if (dev->base == NULL) { printk(KERN_ERR "%s: Can't map device registers!\n", |