git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
net
/
ibmlana.c
diff --git
a/drivers/net/ibmlana.c
b/drivers/net/ibmlana.c
index
2a95d72
..
3f946c8
100644
(file)
--- a/
drivers/net/ibmlana.c
+++ b/
drivers/net/ibmlana.c
@@
-705,7
+705,7
@@
static void irqtxerr_handler(struct net_device *dev)
/* general interrupt entry */
-static irqreturn_t irq_handler(int irq, void *device
, struct pt_regs *regs
)
+static irqreturn_t irq_handler(int irq, void *device)
{
struct net_device *dev = (struct net_device *) device;
u16 ival;