Merge branch 'master' into for-next

[cascardo/linux.git] / drivers / staging / rt2860 / common / cmm_aes.c

diff --git a/drivers/staging/rt2860/common/cmm_aes.c b/drivers/staging/rt2860/common/cmm_aes.c
index a99879b..d70d229 100644 (file)
--- a/drivers/staging/rt2860/common/cmm_aes.c
+++ b/drivers/staging/rt2860/common/cmm_aes.c
@@ -858,7 +858,7 @@ static uint32 KT1[256];
 static uint32 KT2[256];
 static uint32 KT3[256];
 
-/* platform-independant        32-bit integer manipulation     macros */
+/* platform-independent        32-bit integer manipulation     macros */
 
 #define        GET_UINT32(n,b,i)                                               \
 {                                                                                              \