diff --git a/[refs] b/[refs] index 4d92f8712b04..841dd76d903f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 368d06f5b0eefcbf37d677d3b65381310a251f03 +refs/heads/master: c7a00dc73b7185ab2ebd1aa7ce710c7b4edc77a4 diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c index c453226f06b2..e6b1fba980c6 100644 --- a/trunk/net/mac80211/util.c +++ b/trunk/net/mac80211/util.c @@ -1097,9 +1097,9 @@ int ieee80211_reconfig(struct ieee80211_local *local) */ res = drv_start(local); if (res) { - WARN(local->suspended, "Harware became unavailable " - "upon resume. This is could be a software issue" - "prior to suspend or a hardware issue\n"); + WARN(local->suspended, "Hardware became unavailable " + "upon resume. This could be a software issue " + "prior to suspend or a hardware issue.\n"); return res; }