From: Jarkko Nikula <jhnikula@gmail.com>
Date: Fri, 10 Dec 2010 18:54:49 +0000 (+0200)
Subject: ASoC: Fix build error caused by merging a fix for 2.6.37 into 2.6.38
X-Git-Tag: v2.6.38-rc1~236^2^2~53
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f0e25282b93242780a405585a8e3e6f0cc7fa91;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed