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

[pandora-kernel.git] / arch / x86 / crypto / twofish-i586-asm_32.S

diff --git a/arch/x86/crypto/twofish-i586-asm_32.S b/arch/x86/crypto/twofish-i586-asm_32.S
index 39b98ed..575331c 100644 (file)
--- a/arch/x86/crypto/twofish-i586-asm_32.S
+++ b/arch/x86/crypto/twofish-i586-asm_32.S
@@ -22,7 +22,7 @@
 
 #include <asm/asm-offsets.h>
 
-/* return adress at 0 */
+/* return address at 0 */
 
 #define in_blk    12  /* input byte array address parameter*/
 #define out_blk   8  /* output byte array address parameter*/
@@ -230,8 +230,8 @@ twofish_enc_blk:
        push    %edi
 
        mov     tfm + 16(%esp), %ebp    /* abuse the base pointer: set new base bointer to the crypto tfm */
-       add     $crypto_tfm_ctx_offset, %ebp    /* ctx adress */
-       mov     in_blk+16(%esp),%edi    /* input adress in edi */
+       add     $crypto_tfm_ctx_offset, %ebp    /* ctx address */
+       mov     in_blk+16(%esp),%edi    /* input address in edi */
 
        mov     (%edi),         %eax
        mov     b_offset(%edi), %ebx
@@ -286,8 +286,8 @@ twofish_dec_blk:
 
 
        mov     tfm + 16(%esp), %ebp    /* abuse the base pointer: set new base bointer to the crypto tfm */
-       add     $crypto_tfm_ctx_offset, %ebp    /* ctx adress */
-       mov     in_blk+16(%esp),%edi    /* input adress in edi */
+       add     $crypto_tfm_ctx_offset, %ebp    /* ctx address */
+       mov     in_blk+16(%esp),%edi    /* input address in edi */
 
        mov     (%edi),         %eax
        mov     b_offset(%edi), %ebx