diff options
Diffstat (limited to 'drivers/net/sis900.c')
-rw-r--r-- | drivers/net/sis900.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 28606e20df1c..fb2b53051635 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -218,7 +218,7 @@ static void sis900_init_rx_ring(struct net_device *net_dev); | |||
218 | static int sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev); | 218 | static int sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev); |
219 | static int sis900_rx(struct net_device *net_dev); | 219 | static int sis900_rx(struct net_device *net_dev); |
220 | static void sis900_finish_xmit (struct net_device *net_dev); | 220 | static void sis900_finish_xmit (struct net_device *net_dev); |
221 | static irqreturn_t sis900_interrupt(int irq, void *dev_instance, struct pt_regs *regs); | 221 | static irqreturn_t sis900_interrupt(int irq, void *dev_instance); |
222 | static int sis900_close(struct net_device *net_dev); | 222 | static int sis900_close(struct net_device *net_dev); |
223 | static int mii_ioctl(struct net_device *net_dev, struct ifreq *rq, int cmd); | 223 | static int mii_ioctl(struct net_device *net_dev, struct ifreq *rq, int cmd); |
224 | static struct net_device_stats *sis900_get_stats(struct net_device *net_dev); | 224 | static struct net_device_stats *sis900_get_stats(struct net_device *net_dev); |
@@ -988,7 +988,7 @@ static u16 sis900_reset_phy(struct net_device *net_dev, int phy_addr) | |||
988 | static void sis900_poll(struct net_device *dev) | 988 | static void sis900_poll(struct net_device *dev) |
989 | { | 989 | { |
990 | disable_irq(dev->irq); | 990 | disable_irq(dev->irq); |
991 | sis900_interrupt(dev->irq, dev, NULL); | 991 | sis900_interrupt(dev->irq, dev); |
992 | enable_irq(dev->irq); | 992 | enable_irq(dev->irq); |
993 | } | 993 | } |
994 | #endif | 994 | #endif |
@@ -1642,7 +1642,7 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev) | |||
1642 | * and cleans up after the Tx thread | 1642 | * and cleans up after the Tx thread |
1643 | */ | 1643 | */ |
1644 | 1644 | ||
1645 | static irqreturn_t sis900_interrupt(int irq, void *dev_instance, struct pt_regs *regs) | 1645 | static irqreturn_t sis900_interrupt(int irq, void *dev_instance) |
1646 | { | 1646 | { |
1647 | struct net_device *net_dev = dev_instance; | 1647 | struct net_device *net_dev = dev_instance; |
1648 | struct sis900_private *sis_priv = net_dev->priv; | 1648 | struct sis900_private *sis_priv = net_dev->priv; |