vserver 1.9.5.x5

[linux-2.6.git] / drivers / net / tulip / timer.c

diff --git a/drivers/net/tulip/timer.c b/drivers/net/tulip/timer.c
index 69f06dc..6915682 100644 (file)
--- a/drivers/net/tulip/timer.c
+++ b/drivers/net/tulip/timer.c
@@ -14,6 +14,7 @@
 
 */
 
+#include <linux/pci.h>
 #include "tulip.h"
 
 
@@ -21,16 +22,16 @@ void tulip_timer(unsigned long data)
 {
        struct net_device *dev = (struct net_device *)data;
        struct tulip_private *tp = netdev_priv(dev);
-       long ioaddr = dev->base_addr;
-       u32 csr12 = inl(ioaddr + CSR12);
+       void __iomem *ioaddr = tp->base_addr;
+       u32 csr12 = ioread32(ioaddr + CSR12);
        int next_tick = 2*HZ;
 
        if (tulip_debug > 2) {
                printk(KERN_DEBUG "%s: Media selection tick, %s, status %8.8x mode"
                           " %8.8x SIA %8.8x %8.8x %8.8x %8.8x.\n",
-                          dev->name, medianame[dev->if_port], inl(ioaddr + CSR5),
-                          inl(ioaddr + CSR6), csr12, inl(ioaddr + CSR13),
-                          inl(ioaddr + CSR14), inl(ioaddr + CSR15));
+                          dev->name, medianame[dev->if_port], ioread32(ioaddr + CSR5),
+                          ioread32(ioaddr + CSR6), csr12, ioread32(ioaddr + CSR13),
+                          ioread32(ioaddr + CSR14), ioread32(ioaddr + CSR15));
        }
        switch (tp->chip_id) {
        case DC21140:
@@ -38,6 +39,7 @@ void tulip_timer(unsigned long data)
        case MX98713:
        case COMPEX9881:
        case DM910X:
+       case ULI526X:
        default: {
                struct medialeaf *mleaf;
                unsigned char *p;
@@ -48,7 +50,7 @@ void tulip_timer(unsigned long data)
                        if (tulip_debug > 2)
                                printk(KERN_DEBUG "%s: network media monitor CSR6 %8.8x "
                                           "CSR12 0x%2.2x.\n",
-                                          dev->name, inl(ioaddr + CSR6), csr12 & 0xff);
+                                          dev->name, ioread32(ioaddr + CSR6), csr12 & 0xff);
                        break;
                }
                mleaf = &tp->mtable->mleaf[tp->cur_index];
@@ -136,12 +138,12 @@ void mxic_timer(unsigned long data)
 {
        struct net_device *dev = (struct net_device *)data;
        struct tulip_private *tp = netdev_priv(dev);
-       long ioaddr = dev->base_addr;
+       void __iomem *ioaddr = tp->base_addr;
        int next_tick = 60*HZ;
 
        if (tulip_debug > 3) {
                printk(KERN_INFO"%s: MXIC negotiation status %8.8x.\n", dev->name,
-                          inl(ioaddr + CSR12));
+                          ioread32(ioaddr + CSR12));
        }
        if (next_tick) {
                mod_timer(&tp->timer, RUN_AT(next_tick));