From 0d124193de8dfd73ac4b92a9e4177e6d37a1654f Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 15 Sep 2010 15:16:22 -0400
Subject: [PATCH] --- yaml --- r: 214683 b: refs/heads/master c:
 20c956dfbeec823082054954b2443e736455418b h: refs/heads/master i:   214681:
 9fd8a50ab2d8f27c4b4faf7e19cff1fd9df472f7   214679:
 894d9e7a88064706367944333bce23428e4557c5 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-scan.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;