summaryrefslogtreecommitdiffstats
path: root/drivers/net/mipsnet.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-14 18:01:56 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-14 18:01:56 +0100
commitb89371621e5bedc84498ced2c5c33976bd1b2f64 (patch)
treeb309919239586e25617a17785b827577b1abb6b5 /drivers/net/mipsnet.c
parentsound: add Edirol UA-101 support (diff)
parentALSA: sb_mixer: convert pointer tables to mixer control tables (diff)
downloadlinux-b89371621e5bedc84498ced2c5c33976bd1b2f64.tar.xz
linux-b89371621e5bedc84498ced2c5c33976bd1b2f64.zip
Merge branch 'next/isa' into topic/misc
Diffstat (limited to 'drivers/net/mipsnet.c')
-rw-r--r--drivers/net/mipsnet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mipsnet.c b/drivers/net/mipsnet.c
index 8ea98bd89ff1..8e9704f5c122 100644
--- a/drivers/net/mipsnet.c
+++ b/drivers/net/mipsnet.c
@@ -211,7 +211,7 @@ static int mipsnet_open(struct net_device *dev)
{
int err;
- err = request_irq(dev->irq, &mipsnet_interrupt,
+ err = request_irq(dev->irq, mipsnet_interrupt,
IRQF_SHARED, dev->name, (void *) dev);
if (err) {
release_region(dev->base_addr, sizeof(struct mipsnet_regs));