From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 14 Jun 2011 08:51:50 +0000 (+0100)
Subject: ASoC: Fix mismerge with release branch
X-Git-Tag: v3.1-rc1~271^2~2^2~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=169d5a83f687c37104d51cbaa639bdffca8a1cd3;p=thirdparty%2Flinux.git

ASoC: Fix mismerge with release branch

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 7c5465b14d333..602024d4c4597 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -431,6 +431,7 @@ struct snd_soc_dapm_path {
 	/* status */
 	u32 connect:1;	/* source and sink widgets are connected */
 	u32 walked:1;	/* path has been walked */
+	u32 weak:1;	/* path ignored for power management */
 
 	int (*connected)(struct snd_soc_dapm_widget *source,
 			 struct snd_soc_dapm_widget *sink);