diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/sunqe.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/sunqe.c')
| -rw-r--r-- | drivers/net/sunqe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c index dcefb608a9f4..45c383f285ee 100644 --- a/drivers/net/sunqe.c +++ b/drivers/net/sunqe.c | |||
| @@ -807,7 +807,7 @@ static struct sunqec * __devinit get_qec(struct of_device *child) | |||
| 807 | 807 | ||
| 808 | qec_init_once(qecp, op); | 808 | qec_init_once(qecp, op); |
| 809 | 809 | ||
| 810 | if (request_irq(op->irqs[0], &qec_interrupt, | 810 | if (request_irq(op->irqs[0], qec_interrupt, |
| 811 | IRQF_SHARED, "qec", (void *) qecp)) { | 811 | IRQF_SHARED, "qec", (void *) qecp)) { |
| 812 | printk(KERN_ERR "qec: Can't register irq.\n"); | 812 | printk(KERN_ERR "qec: Can't register irq.\n"); |
| 813 | goto fail; | 813 | goto fail; |