]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: Fix build error caused by merging a fix for 2.6.37 into 2.6.38
authorJarkko Nikula <jhnikula@gmail.com>
Fri, 10 Dec 2010 18:54:49 +0000 (20:54 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Dec 2010 16:49:22 +0000 (16:49 +0000)
commite72064f42ec99b5a6a45e9f5c543233ce609f2c7
tree34cb986659c0704660c006921ebd58d8bcb96b9c
parent198ddbe263d3b9957583bc3660bc433d40363287
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 92ca9f5 "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>
sound/soc/soc-dapm.c