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 /sound/aoa | |
| 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 'sound/aoa')
| -rw-r--r-- | sound/aoa/codecs/tas.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/aoa/codecs/tas.c b/sound/aoa/codecs/tas.c index fd2188c3df2b..58804c7acfcf 100644 --- a/sound/aoa/codecs/tas.c +++ b/sound/aoa/codecs/tas.c | |||
| @@ -170,7 +170,7 @@ static void tas_set_volume(struct tas *tas) | |||
| 170 | /* analysing the volume and mixer tables shows | 170 | /* analysing the volume and mixer tables shows |
| 171 | * that they are similar enough when we shift | 171 | * that they are similar enough when we shift |
| 172 | * the mixer table down by 4 bits. The error | 172 | * the mixer table down by 4 bits. The error |
| 173 | * is miniscule, in just one item the error | 173 | * is minuscule, in just one item the error |
| 174 | * is 1, at a value of 0x07f17b (mixer table | 174 | * is 1, at a value of 0x07f17b (mixer table |
| 175 | * value is 0x07f17a) */ | 175 | * value is 0x07f17a) */ |
| 176 | tmp = tas_gaintable[left]; | 176 | tmp = tas_gaintable[left]; |