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/smc9194.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/smc9194.c')
| -rw-r--r-- | drivers/net/smc9194.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c index 934a12012829..8371b82323ac 100644 --- a/drivers/net/smc9194.c +++ b/drivers/net/smc9194.c | |||
| @@ -1050,7 +1050,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr) | |||
| 1050 | memset(netdev_priv(dev), 0, sizeof(struct smc_local)); | 1050 | memset(netdev_priv(dev), 0, sizeof(struct smc_local)); |
| 1051 | 1051 | ||
| 1052 | /* Grab the IRQ */ | 1052 | /* Grab the IRQ */ |
| 1053 | retval = request_irq(dev->irq, &smc_interrupt, 0, DRV_NAME, dev); | 1053 | retval = request_irq(dev->irq, smc_interrupt, 0, DRV_NAME, dev); |
| 1054 | if (retval) { | 1054 | if (retval) { |
| 1055 | printk("%s: unable to get IRQ %d (irqval=%d).\n", DRV_NAME, | 1055 | printk("%s: unable to get IRQ %d (irqval=%d).\n", DRV_NAME, |
| 1056 | dev->irq, retval); | 1056 | dev->irq, retval); |