Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/ath/ath9k/ar9003_eeprom.c net/llc/af_llc.c
This commit is contained in:
@@ -916,8 +916,6 @@ void lbs_remove_card(struct lbs_private *priv)
|
||||
|
||||
lbs_free_adapter(priv);
|
||||
lbs_cfg_free(priv);
|
||||
|
||||
priv->dev = NULL;
|
||||
free_netdev(dev);
|
||||
|
||||
lbs_deb_leave(LBS_DEB_MAIN);
|
||||
|
Reference in New Issue
Block a user