Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / ni52.c

diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index 4d52ecf8af567a125ede66f68c7d4aadde80a1d2..26e42f6e9fb10323ec9dcb492b6b1af86ebda147 100644 (file)
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -195,7 +195,7 @@ sizeof(nop_cmd) = 8;
 #define NI52_ADDR2 0x01
 
 static int     ni52_probe1(struct net_device *dev,int ioaddr);
-static irqreturn_t ni52_interrupt(int irq,void *dev_id,struct pt_regs *reg_ptr);
+static irqreturn_t ni52_interrupt(int irq,void *dev_id);
 static int     ni52_open(struct net_device *dev);
 static int     ni52_close(struct net_device *dev);
 static int     ni52_send_packet(struct sk_buff *,struct net_device *);
@@ -639,7 +639,7 @@ static int init586(struct net_device *dev)
        /*
         * TDR, wire check .. e.g. no resistor e.t.c
         */
-        
+
        tdr_cmd = (struct tdr_cmd_struct *)ptr;
 
        tdr_cmd->cmd_status     = 0;
@@ -837,7 +837,7 @@ static void *alloc_rfa(struct net_device *dev,void *ptr)
  * Interrupt Handler ...
  */
 
-static irqreturn_t ni52_interrupt(int irq,void *dev_id,struct pt_regs *reg_ptr)
+static irqreturn_t ni52_interrupt(int irq,void *dev_id)
 {
        struct net_device *dev = dev_id;
        unsigned short stat;