Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville...

[mv-sheeva.git] / drivers / net / wireless / ath / ath5k / base.h

diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h
index 9c2fbf230ce738b4290bc3263890c229fa428994..7e1a88a5abdb3e930259a7451078b26a5c6a7ee9 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/base.h
+++ b/drivers/net/wireless/ath/ath5k/base.h
@@ -36,7 +36,7 @@
  */
 
 /*
- * Defintions for the Atheros Wireless LAN controller driver.
+ * Definitions for the Atheros Wireless LAN controller driver.
  */
 #ifndef _DEV_ATH_ATHVAR_H
 #define _DEV_ATH_ATHVAR_H
@@ -189,7 +189,7 @@ struct ath5k_softc {
        struct ath5k_txq        *cabq;          /* content after beacon */
 
        int                     power_level;    /* Requested tx power in dbm */
-       bool                    assoc;          /* assocate state */
+       bool                    assoc;          /* associate state */
        bool                    enable_beacon;  /* true if beacons are on */
 };