Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[linux-2.6.git] / drivers / net / wireless / rtlwifi / base.c
index d366657..ccb6da3 100644 (file)
@@ -698,7 +698,7 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw,
                         *because hw will nerver use hw_rate
                         *when tcb_desc->use_driver_rate = false
                         *so we never set highest N rate here,
-                        *and N rate will all be controled by FW
+                        *and N rate will all be controlled by FW
                         *when tcb_desc->use_driver_rate = false
                         */
                        if (sta && (sta->ht_cap.ht_supported)) {