Merge wireless into wireless-next

[sfrench/cifs-2.6.git] / net / mac80211 / cfg.c

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 672eff6f5d328de2d6e09cf9909f5e1923dbc8a2..7f549862c83ee3403345f9872c343b3ff18b565d 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2734,7 +2734,7 @@ static int ieee80211_scan(struct wiphy *wiphy,
                 * If the scan has been forced (and the driver supports
                 * forcing), don't care about being beaconing already.
                 * This will create problems to the attached stations (e.g. all
-                * the  frames sent while scanning on other channel will be
+                * the frames sent while scanning on other channel will be
                 * lost)
                 */
                if (sdata->deflink.u.ap.beacon &&