diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /arch/parisc/math-emu/sfsub.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'arch/parisc/math-emu/sfsub.c')
| -rw-r--r-- | arch/parisc/math-emu/sfsub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/math-emu/sfsub.c b/arch/parisc/math-emu/sfsub.c index 24eef61c8e3b..5f90d0f31a52 100644 --- a/arch/parisc/math-emu/sfsub.c +++ b/arch/parisc/math-emu/sfsub.c | |||
| @@ -301,7 +301,7 @@ sgl_fsub( | |||
| 301 | if(Sgl_iszero_hidden(result)) | 301 | if(Sgl_iszero_hidden(result)) |
| 302 | { | 302 | { |
| 303 | /* Handle normalization */ | 303 | /* Handle normalization */ |
| 304 | /* A straight foward algorithm would now shift the result | 304 | /* A straightforward algorithm would now shift the result |
| 305 | * and extension left until the hidden bit becomes one. Not | 305 | * and extension left until the hidden bit becomes one. Not |
| 306 | * all of the extension bits need participate in the shift. | 306 | * all of the extension bits need participate in the shift. |
| 307 | * Only the two most significant bits (round and guard) are | 307 | * Only the two most significant bits (round and guard) are |