Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / rt2860 / spectrum.h

diff --git a/drivers/staging/rt2860/spectrum.h b/drivers/staging/rt2860/spectrum.h
index 648fd632b606d5ec60179939c27d5bbccfafaf90..4c325ba7ba212fe0dae4f1830a62aeeaaebf3977 100644 (file)
--- a/drivers/staging/rt2860/spectrum.h
+++ b/drivers/staging/rt2860/spectrum.h
@@ -37,7 +37,7 @@ char RTMP_GetTxPwr(struct rt_rtmp_adapter *pAd, IN HTTRANSMIT_SETTING HTTxMode);
        ==========================================================================
        Description:
                Prepare Measurement request action frame and enqueue it into
-               management queue waiting for transmition.
+               management queue waiting for transmission.
 
        Parametrs:
                1. the destination mac address of the frame.
@@ -60,7 +60,7 @@ void MakeMeasurementReqFrame(struct rt_rtmp_adapter *pAd,
        ==========================================================================
        Description:
                Prepare Measurement report action frame and enqueue it into
-               management queue waiting for transmition.
+               management queue waiting for transmission.
 
        Parametrs:
                1. the destination mac address of the frame.
@@ -80,7 +80,7 @@ void EnqueueMeasurementRep(struct rt_rtmp_adapter *pAd,
        ==========================================================================
        Description:
                Prepare TPC Request action frame and enqueue it into
-               management queue waiting for transmition.
+               management queue waiting for transmission.
 
        Parametrs:
                1. the destination mac address of the frame.
@@ -94,7 +94,7 @@ void EnqueueTPCReq(struct rt_rtmp_adapter *pAd, u8 *pDA, u8 DialogToken);
        ==========================================================================
        Description:
                Prepare TPC Report action frame and enqueue it into
-               management queue waiting for transmition.
+               management queue waiting for transmission.
 
        Parametrs:
                1. the destination mac address of the frame.
@@ -110,7 +110,7 @@ void EnqueueTPCRep(struct rt_rtmp_adapter *pAd,
        ==========================================================================
        Description:
                Prepare Channel Switch Announcement action frame and enqueue it into
-               management queue waiting for transmition.
+               management queue waiting for transmission.
 
        Parametrs:
                1. the destination mac address of the frame.
@@ -126,7 +126,7 @@ void EnqueueChSwAnn(struct rt_rtmp_adapter *pAd,
 /*
        ==========================================================================
        Description:
-               Spectrun action frames Handler such as channel switch annoucement,
+               Spectrun action frames Handler such as channel switch announcement,
                measurement report, measurement request actions frames.
 
        Parametrs: