diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-12 23:15:27 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-12 23:15:27 +0000 |
commit | ae38fd1e4c98588314a42097c5a5e77dcef23561 (patch) | |
tree | f9f10c203bb9e5fbad4810d1f8774c08dfad20ff /drivers/net/yellowfin.c | |
parent | 466a823d79f41d0713b272e48fd73e494b0588e0 (diff) |
Merge with Linux 2.3.50.
Diffstat (limited to 'drivers/net/yellowfin.c')
-rw-r--r-- | drivers/net/yellowfin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 7eb759b94..85febe47d 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c @@ -1263,7 +1263,7 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev, real_ioaddr = ioaddr = pci_resource_start (pdev, 0); #else real_ioaddr = ioaddr = pci_resource_start (pdev, 1); - ioaddr = ioremap(ioaddr, YELLOWFIN_SIZE); + ioaddr = (long) ioremap(ioaddr, YELLOWFIN_SIZE); #endif irq = pdev->irq; |