From 169d5a83f687c37104d51cbaa639bdffca8a1cd3 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 14 Jun 2011 09:51:50 +0100 Subject: [PATCH] ASoC: Fix mismerge with release branch Signed-off-by: Mark Brown --- include/sound/soc-dapm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 7c5465b14d33..602024d4c459 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); -- 2.30.2