diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-07-12 15:21:05 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-12 15:21:05 -0400 |
| commit | d07d152892aadd8dc3209ecef6788dfc83475676 (patch) | |
| tree | 0f140aa244ddc2c52494155342298cef64fc8456 /drivers/net/wireless/libertas | |
| parent | 2f8684ce7a47c91da7e0ccba2686277c103d02b6 (diff) | |
| parent | 685fb72b63faf09a767cc28332545f5830b91be8 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/iwmc3200wifi/cfg80211.c
drivers/net/wireless/mwifiex/cfg80211.c
Diffstat (limited to 'drivers/net/wireless/libertas')
| -rw-r--r-- | drivers/net/wireless/libertas/cfg.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c index f4a203049fb4..706781316195 100644 --- a/drivers/net/wireless/libertas/cfg.c +++ b/drivers/net/wireless/libertas/cfg.c | |||
| @@ -805,7 +805,6 @@ void lbs_scan_done(struct lbs_private *priv) | |||
| 805 | } | 805 | } |
| 806 | 806 | ||
| 807 | static int lbs_cfg_scan(struct wiphy *wiphy, | 807 | static int lbs_cfg_scan(struct wiphy *wiphy, |
| 808 | struct net_device *dev, | ||
| 809 | struct cfg80211_scan_request *request) | 808 | struct cfg80211_scan_request *request) |
| 810 | { | 809 | { |
| 811 | struct lbs_private *priv = wiphy_priv(wiphy); | 810 | struct lbs_private *priv = wiphy_priv(wiphy); |