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 /lib/bitmap.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 'lib/bitmap.c')
| -rw-r--r-- | lib/bitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bitmap.c b/lib/bitmap.c index 741fae905ae3..91e0ccfdb424 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c | |||
| @@ -830,7 +830,7 @@ EXPORT_SYMBOL(bitmap_bitremap); | |||
| 830 | * @orig (i.e. bits 3, 5, 7 and 9) were also set. | 830 | * @orig (i.e. bits 3, 5, 7 and 9) were also set. |
| 831 | * | 831 | * |
| 832 | * When bit 11 is set in @orig, it means turn on the bit in | 832 | * When bit 11 is set in @orig, it means turn on the bit in |
| 833 | * @dst corresponding to whatever is the twelth bit that is | 833 | * @dst corresponding to whatever is the twelfth bit that is |
| 834 | * turned on in @relmap. In the above example, there were | 834 | * turned on in @relmap. In the above example, there were |
| 835 | * only ten bits turned on in @relmap (30..39), so that bit | 835 | * only ten bits turned on in @relmap (30..39), so that bit |
| 836 | * 11 was set in @orig had no affect on @dst. | 836 | * 11 was set in @orig had no affect on @dst. |