diff --git a/[refs] b/[refs] index 66b80d2087cc..2d0cfe5c37bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d2080c3c1d52e186166afc3efe5067291e618bf +refs/heads/master: 20c956dfbeec823082054954b2443e736455418b diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c index 599573f2b01f..c54c20023e7c 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -350,7 +350,7 @@ EXPORT_SYMBOL(iwl_init_scan_params); static int __must_check iwl_scan_initiate(struct iwl_priv *priv, struct ieee80211_vif *vif, bool internal, - enum nl80211_band band) + enum ieee80211_band band) { int ret;