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/myri_sbus.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/myri_sbus.c')
| -rw-r--r-- | drivers/net/myri_sbus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c index 29ebebc6a95b..b3513ad3b703 100644 --- a/drivers/net/myri_sbus.c +++ b/drivers/net/myri_sbus.c | |||
| @@ -1084,7 +1084,7 @@ static int __devinit myri_sbus_probe(struct of_device *op, const struct of_devic | |||
| 1084 | 1084 | ||
| 1085 | /* Register interrupt handler now. */ | 1085 | /* Register interrupt handler now. */ |
| 1086 | DET(("Requesting MYRIcom IRQ line.\n")); | 1086 | DET(("Requesting MYRIcom IRQ line.\n")); |
| 1087 | if (request_irq(dev->irq, &myri_interrupt, | 1087 | if (request_irq(dev->irq, myri_interrupt, |
| 1088 | IRQF_SHARED, "MyriCOM Ethernet", (void *) dev)) { | 1088 | IRQF_SHARED, "MyriCOM Ethernet", (void *) dev)) { |
| 1089 | printk("MyriCOM: Cannot register interrupt handler.\n"); | 1089 | printk("MyriCOM: Cannot register interrupt handler.\n"); |
| 1090 | goto err; | 1090 | goto err; |