projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
[powerpc.git]
/
drivers
/
net
/
acenic.c
diff --git
a/drivers/net/acenic.c
b/drivers/net/acenic.c
index
71a4f60
..
33c6645
100644
(file)
--- a/
drivers/net/acenic.c
+++ b/
drivers/net/acenic.c
@@
-2144,7
+2144,7
@@
static inline void ace_tx_int(struct net_device *dev,
}
-static irqreturn_t ace_interrupt(int irq, void *dev_id
, struct pt_regs *ptregs
)
+static irqreturn_t ace_interrupt(int irq, void *dev_id)
{
struct net_device *dev = (struct net_device *)dev_id;
struct ace_private *ap = netdev_priv(dev);