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 /crypto/gf128mul.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 'crypto/gf128mul.c')
| -rw-r--r-- | crypto/gf128mul.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/gf128mul.c b/crypto/gf128mul.c index a90d260528d4..df35e4ccd07e 100644 --- a/crypto/gf128mul.c +++ b/crypto/gf128mul.c | |||
| @@ -89,7 +89,7 @@ | |||
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | /* Given the value i in 0..255 as the byte overflow when a field element | 91 | /* Given the value i in 0..255 as the byte overflow when a field element |
| 92 | in GHASH is multipled by x^8, this function will return the values that | 92 | in GHASH is multiplied by x^8, this function will return the values that |
| 93 | are generated in the lo 16-bit word of the field value by applying the | 93 | are generated in the lo 16-bit word of the field value by applying the |
| 94 | modular polynomial. The values lo_byte and hi_byte are returned via the | 94 | modular polynomial. The values lo_byte and hi_byte are returned via the |
| 95 | macro xp_fun(lo_byte, hi_byte) so that the values can be assembled into | 95 | macro xp_fun(lo_byte, hi_byte) so that the values can be assembled into |