diff options
Diffstat (limited to 'drivers/net/tlan.c')
-rw-r--r-- | drivers/net/tlan.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c index 8d807bf603a0..e14f5a00f65a 100644 --- a/drivers/net/tlan.c +++ b/drivers/net/tlan.c | |||
@@ -289,7 +289,7 @@ static void TLan_Eisa_Cleanup( void ); | |||
289 | static int TLan_Init( struct net_device * ); | 289 | static int TLan_Init( struct net_device * ); |
290 | static int TLan_Open( struct net_device *dev ); | 290 | static int TLan_Open( struct net_device *dev ); |
291 | static int TLan_StartTx( struct sk_buff *, struct net_device *); | 291 | static int TLan_StartTx( struct sk_buff *, struct net_device *); |
292 | static irqreturn_t TLan_HandleInterrupt( int, void *, struct pt_regs *); | 292 | static irqreturn_t TLan_HandleInterrupt( int, void *); |
293 | static int TLan_Close( struct net_device *); | 293 | static int TLan_Close( struct net_device *); |
294 | static struct net_device_stats *TLan_GetStats( struct net_device *); | 294 | static struct net_device_stats *TLan_GetStats( struct net_device *); |
295 | static void TLan_SetMulticastList( struct net_device *); | 295 | static void TLan_SetMulticastList( struct net_device *); |
@@ -824,7 +824,7 @@ static void __init TLan_EisaProbe (void) | |||
824 | static void TLan_Poll(struct net_device *dev) | 824 | static void TLan_Poll(struct net_device *dev) |
825 | { | 825 | { |
826 | disable_irq(dev->irq); | 826 | disable_irq(dev->irq); |
827 | TLan_HandleInterrupt(dev->irq, dev, NULL); | 827 | TLan_HandleInterrupt(dev->irq, dev); |
828 | enable_irq(dev->irq); | 828 | enable_irq(dev->irq); |
829 | } | 829 | } |
830 | #endif | 830 | #endif |
@@ -1151,7 +1151,6 @@ static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev ) | |||
1151 | * occurred. | 1151 | * occurred. |
1152 | * dev_id A pointer to the device assigned to | 1152 | * dev_id A pointer to the device assigned to |
1153 | * this irq line. | 1153 | * this irq line. |
1154 | * regs ??? | ||
1155 | * | 1154 | * |
1156 | * This function handles an interrupt generated by its | 1155 | * This function handles an interrupt generated by its |
1157 | * assigned TLAN adapter. The function deactivates | 1156 | * assigned TLAN adapter. The function deactivates |
@@ -1162,7 +1161,7 @@ static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev ) | |||
1162 | * | 1161 | * |
1163 | **************************************************************/ | 1162 | **************************************************************/ |
1164 | 1163 | ||
1165 | static irqreturn_t TLan_HandleInterrupt(int irq, void *dev_id, struct pt_regs *regs) | 1164 | static irqreturn_t TLan_HandleInterrupt(int irq, void *dev_id) |
1166 | { | 1165 | { |
1167 | u32 ack; | 1166 | u32 ack; |
1168 | struct net_device *dev; | 1167 | struct net_device *dev; |