Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / staging / rtl8192e / ieee80211 / ieee80211.h

diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211.h b/drivers/staging/rtl8192e/ieee80211/ieee80211.h
index 3ca3881..dbe21ab 100644 (file)
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h
@@ -1967,7 +1967,7 @@ struct ieee80211_device {
         u16 prev_seq_ctl;       /* used to drop duplicate frames */
 
        /* map of allowed channels. 0 is dummy */
-       // FIXME: remeber to default to a basic channel plan depending of the PHY type
+       // FIXME: remember to default to a basic channel plan depending of the PHY type
 #ifdef ENABLE_DOT11D
        void* pDot11dInfo;
        bool bGlobalDomain;
@@ -2121,7 +2121,7 @@ struct ieee80211_device {
         * not set. As some cards may have different HW queues that
         * one might want to use for data and management frames
         * the option to have two callbacks might be useful.
-        * This fucntion can't sleep.
+        * This function can't sleep.
         */
        int (*softmac_hard_start_xmit)(struct sk_buff *skb,
                               struct ieee80211_device *ieee80211);
@@ -2160,9 +2160,9 @@ struct ieee80211_device {
         * it is called in a work_queue when swithcing to ad-hoc mode
         * or in behalf of iwlist scan when the card is associated
         * and root user ask for a scan.
-        * the fucntion stop_scan should stop both the syncro and
+        * the function stop_scan should stop both the syncro and
         * background scanning and can sleep.
-        * The fucntion start_scan should initiate the background
+        * The function start_scan should initiate the background
         * scanning and can't sleep.
         */
        void (*scan_syncro)(struct ieee80211_device *ieee80211);