diff options
| author | Jarkko Nikula <jhnikula@gmail.com> | 2010-12-10 19:54:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-13 17:49:22 +0100 |
| commit | 0f0e25282b93242780a405585a8e3e6f0cc7fa91 (patch) | |
| tree | 34cb986659c0704660c006921ebd58d8bcb96b9c /fs/nfs | |
| parent | Merge branch 'for-2.6.37' into for-2.6.38 (diff) | |
| download | linux-0f0e25282b93242780a405585a8e3e6f0cc7fa91.tar.xz linux-0f0e25282b93242780a405585a8e3e6f0cc7fa91.zip | |
ASoC: Fix build error caused by merging a fix for 2.6.37 into 2.6.38
Fix "ASoC: Fix bias power down of non-DAPM codec" for 3.6.37 will cause a
build error when merging into ASoC for-2.6.38. Fix the issue by doing a
change that commit ce6120c "ASoC: Decouple DAPM from CODECs" would do.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions