X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fnet%2Fdgrs.c;h=a79520295fd0ec9fcce2330ecc98cc1542cd14b9;hb=f2d71c2d800e68f158a5949e38b23f5140948548;hp=e9361cb5f4cd44297ab0ed0fbe99f050333d9360;hpb=6aa20a2235535605db6d6d2bd850298b2fe7f31e;p=safe%2Fjmp%2Flinux-2.6 diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c index e9361cb..a795202 100644 --- a/drivers/net/dgrs.c +++ b/drivers/net/dgrs.c @@ -110,7 +110,6 @@ static char version[] __initdata = * DGRS include files */ typedef unsigned char uchar; -typedef unsigned int bool; #define vol volatile #include "dgrs.h" @@ -896,10 +895,10 @@ static int dgrs_ioctl(struct net_device *devN, struct ifreq *ifr, int cmd) * dev, priv will always refer to the 0th device in Multi-NIC mode. */ -static irqreturn_t dgrs_intr(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t dgrs_intr(int irq, void *dev_id) { - struct net_device *dev0 = (struct net_device *) dev_id; - DGRS_PRIV *priv0 = (DGRS_PRIV *) dev0->priv; + struct net_device *dev0 = dev_id; + DGRS_PRIV *priv0 = dev0->priv; I596_CB *cbp; int cmd; int i;