diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-06 18:21:44 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-06 18:21:44 -0800 |
| commit | bb7b22840141a4fab8f232ee90d30cdf728bb032 (patch) | |
| tree | 43a92bc304db0fc53155b70f83f3dd39e62a775a /drivers/net/wireless/ipw2x00/ipw2200.c | |
| parent | 539054a8fa5141c9a4e9ac6a86d249e3f2bdef45 (diff) | |
| parent | 66f84d6594729c866c0c03fe97159a987dad7d84 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2200.c')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2200.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 04341a2a619..8d58e6ed4e7 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c @@ -11821,7 +11821,6 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev, if (err) { IPW_ERROR("Failed to register promiscuous network " "device (error %d).\n", err); - unregister_ieee80211(priv->ieee); unregister_netdev(priv->net_dev); goto out_remove_sysfs; } @@ -11872,7 +11871,6 @@ static void __devexit ipw_pci_remove(struct pci_dev *pdev) mutex_unlock(&priv->mutex); - unregister_ieee80211(priv->ieee); unregister_netdev(priv->net_dev); if (priv->rxq) { |