[PATCH] S2io: Timer based slowpath handling

[linux-2.6] / drivers / net / mv643xx_eth.c

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index d6de213720f417f2543ca58694dd6644dad5b14b..0405e1f0d3df183fe004173091aed6ca103751e4 100644 (file)
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -99,7 +99,7 @@ static spinlock_t mv643xx_eth_phy_lock = SPIN_LOCK_UNLOCKED;
 
 static inline u32 mv_read(int offset)
 {
-       void *__iomem reg_base;
+       void __iomem *reg_base;
 
        reg_base = mv643xx_eth_shared_base - MV643XX_ETH_SHARED_REGS;
 
@@ -108,7 +108,7 @@ static inline u32 mv_read(int offset)
 
 static inline void mv_write(int offset, u32 data)
 {
-       void * __iomem reg_base;
+       void __iomem *reg_base;
 
        reg_base = mv643xx_eth_shared_base - MV643XX_ETH_SHARED_REGS;
        writel(data, reg_base + offset);
@@ -668,7 +668,7 @@ static int mv643xx_eth_open(struct net_device *dev)
        spin_lock_irq(&mp->lock);
 
        err = request_irq(dev->irq, mv643xx_eth_int_handler,
-                       SA_INTERRUPT | SA_SAMPLE_RANDOM, dev->name, dev);
+                       SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
 
        if (err) {
                printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",