Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into...

[~andy/linux] / arch / parisc / math-emu / sfadd.c

diff --git a/arch/parisc/math-emu/sfadd.c b/arch/parisc/math-emu/sfadd.c
index 008d721b5d2270a595f244e80c37c99532edf87b..f802cd6c7869d8e8f9e9aebe0b9e5dfd4a6007b6 100644 (file)
--- a/arch/parisc/math-emu/sfadd.c
+++ b/arch/parisc/math-emu/sfadd.c
@@ -298,7 +298,7 @@ sgl_fadd(
        if(Sgl_iszero_hidden(result))
            {
            /* Handle normalization */
-           /* A straight foward algorithm would now shift the result
+           /* A straightforward algorithm would now shift the result
             * and extension left until the hidden bit becomes one.  Not
             * all of the extension bits need participate in the shift.
             * Only the two most significant bits (round and guard) are