diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/net/appletalk/cops.c | |
parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/appletalk/cops.c')
-rw-r--r-- | drivers/net/appletalk/cops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index ae7f828344d..cc1a27ed197 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c @@ -188,7 +188,7 @@ static void cops_reset (struct net_device *dev, int sleep); static void cops_load (struct net_device *dev); static int cops_nodeid (struct net_device *dev, int nodeid); -static irqreturn_t cops_interrupt (int irq, void *dev_id, struct pt_regs *regs); +static irqreturn_t cops_interrupt (int irq, void *dev_id); static void cops_poll (unsigned long ltdev); static void cops_timeout(struct net_device *dev); static void cops_rx (struct net_device *dev); @@ -721,7 +721,7 @@ static void cops_poll(unsigned long ltdev) * The typical workload of the driver: * Handle the network interface interrupts. */ -static irqreturn_t cops_interrupt(int irq, void *dev_id, struct pt_regs * regs) +static irqreturn_t cops_interrupt(int irq, void *dev_id) { struct net_device *dev = dev_id; struct cops_local *lp; |