diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/mipsnet.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/mipsnet.c')
| -rw-r--r-- | drivers/net/mipsnet.c | 2 |
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) | |||
| 211 | { | 211 | { |
| 212 | int err; | 212 | int err; |
| 213 | 213 | ||
| 214 | err = request_irq(dev->irq, &mipsnet_interrupt, | 214 | err = request_irq(dev->irq, mipsnet_interrupt, |
| 215 | IRQF_SHARED, dev->name, (void *) dev); | 215 | IRQF_SHARED, dev->name, (void *) dev); |
| 216 | if (err) { | 216 | if (err) { |
| 217 | release_region(dev->base_addr, sizeof(struct mipsnet_regs)); | 217 | release_region(dev->base_addr, sizeof(struct mipsnet_regs)); |