diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /arch/parisc/math-emu/sfadd.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'arch/parisc/math-emu/sfadd.c')
| -rw-r--r-- | arch/parisc/math-emu/sfadd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/math-emu/sfadd.c b/arch/parisc/math-emu/sfadd.c index 008d721b5d2..f802cd6c786 100644 --- a/arch/parisc/math-emu/sfadd.c +++ b/arch/parisc/math-emu/sfadd.c | |||
| @@ -298,7 +298,7 @@ sgl_fadd( | |||
| 298 | if(Sgl_iszero_hidden(result)) | 298 | if(Sgl_iszero_hidden(result)) |
| 299 | { | 299 | { |
| 300 | /* Handle normalization */ | 300 | /* Handle normalization */ |
| 301 | /* A straight foward algorithm would now shift the result | 301 | /* A straightforward algorithm would now shift the result |
| 302 | * and extension left until the hidden bit becomes one. Not | 302 | * and extension left until the hidden bit becomes one. Not |
| 303 | * all of the extension bits need participate in the shift. | 303 | * all of the extension bits need participate in the shift. |
| 304 | * Only the two most significant bits (round and guard) are | 304 | * Only the two most significant bits (round and guard) are |