patch-1.3.70 linux/drivers/net/ni52.c
Next file: linux/drivers/net/ni65.c
Previous file: linux/drivers/net/ne.c
Back to the patch index
Back to the overall index
- Lines: 36
- Date:
Fri Mar 1 07:56:09 1996
- Orig file:
v1.3.69/linux/drivers/net/ni52.c
- Orig date:
Wed Feb 28 11:50:05 1996
diff -u --recursive --new-file v1.3.69/linux/drivers/net/ni52.c linux/drivers/net/ni52.c
@@ -188,7 +188,7 @@
#define NI52_ADDR2 0x01
static int ni52_probe1(struct device *dev,int ioaddr);
-static void ni52_interrupt(int irq,struct pt_regs *reg_ptr);
+static void ni52_interrupt(int irq,void *dev_id,struct pt_regs *reg_ptr);
static int ni52_open(struct device *dev);
static int ni52_close(struct device *dev);
static int ni52_send_packet(struct sk_buff *,struct device *);
@@ -235,7 +235,7 @@
*/
static int ni52_close(struct device *dev)
{
- free_irq(dev->irq);
+ free_irq(dev->irq, NULL);
irq2dev_map[dev->irq] = NULL;
ni_reset586(); /* the hard way to stop the receiver */
@@ -259,7 +259,7 @@
startrecv586(dev);
ni_enaint();
- if(request_irq(dev->irq, &ni52_interrupt,0,"ni5210"))
+ if(request_irq(dev->irq, &ni52_interrupt,0,"ni5210",NULL))
{
ni_reset586();
return -EAGAIN;
@@ -810,7 +810,7 @@
* Interrupt Handler ...
*/
-static void ni52_interrupt(int irq,struct pt_regs *reg_ptr)
+static void ni52_interrupt(int irq,void *dev_id,struct pt_regs *reg_ptr)
{
struct device *dev = (struct device *) irq2dev_map[irq];
unsigned short stat;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov
with Sam's (original) version of this