ASoC: Fix mismerge with release branch

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
git-mirror · Jun 14, 2011 · 169d5a8 · 169d5a8
1 parent 65fdd5c
commit 169d5a8
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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);