Staging: Merge staging-next into Linus's tree

[pandora-kernel.git] / drivers / staging / winbond / wbusb.c

diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index 251caa0..abaa05a 100644 (file)
--- a/drivers/staging/winbond/wbusb.c
+++ b/drivers/staging/winbond/wbusb.c
@@ -700,7 +700,7 @@ static int wb35_hw_init(struct ieee80211_hw *hw)
        Mds_initial(priv);
 
        /*
-        * If no user-defined address in the registry, use the addresss
+        * If no user-defined address in the registry, use the address
         * "burned" on the NIC instead.
         */
        pMacAddr = priv->sLocalPara.ThisMacAddress;