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/wireless/adm8211.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/wireless/adm8211.c')
| -rw-r--r-- | drivers/net/wireless/adm8211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index b80f514877d8..39410016b4ff 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c | |||
| @@ -1538,7 +1538,7 @@ static int adm8211_start(struct ieee80211_hw *dev) | |||
| 1538 | adm8211_hw_init(dev); | 1538 | adm8211_hw_init(dev); |
| 1539 | adm8211_rf_set_channel(dev, priv->channel); | 1539 | adm8211_rf_set_channel(dev, priv->channel); |
| 1540 | 1540 | ||
| 1541 | retval = request_irq(priv->pdev->irq, &adm8211_interrupt, | 1541 | retval = request_irq(priv->pdev->irq, adm8211_interrupt, |
| 1542 | IRQF_SHARED, "adm8211", dev); | 1542 | IRQF_SHARED, "adm8211", dev); |
| 1543 | if (retval) { | 1543 | if (retval) { |
| 1544 | printk(KERN_ERR "%s: failed to register IRQ handler\n", | 1544 | printk(KERN_ERR "%s: failed to register IRQ handler\n", |