summaryrefslogtreecommitdiffstats
path: root/drivers/net/sunlance.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-12-09 19:01:03 +1100
committerJames Morris <jmorris@namei.org>2009-12-09 19:01:03 +1100
commit1ad1f10cd915744bbe52b19423653b38287d827d (patch)
treeae072aace36b45a55d80b8cbf1b6d92523a88ea0 /drivers/net/sunlance.c
parent08e3daff217059c84c360cc71212686e0a7995af (diff)
parent2b876f95d03e226394b5d360c86127cbefaf614b (diff)
downloadkernel-crypto-1ad1f10cd915744bbe52b19423653b38287d827d.tar.gz
kernel-crypto-1ad1f10cd915744bbe52b19423653b38287d827d.tar.xz
kernel-crypto-1ad1f10cd915744bbe52b19423653b38287d827d.zip
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/sunlance.c')
-rw-r--r--drivers/net/sunlance.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 9d6fd4760ea..64e7d08c878 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -923,7 +923,7 @@ static int lance_open(struct net_device *dev)
STOP_LANCE(lp);
- if (request_irq(dev->irq, &lance_interrupt, IRQF_SHARED,
+ if (request_irq(dev->irq, lance_interrupt, IRQF_SHARED,
lancestr, (void *) dev)) {
printk(KERN_ERR "Lance: Can't get irq %d\n", dev->irq);
return -EAGAIN;