ASoC: Fix mismerge with release branch
Mark Brown [Tue, 14 Jun 2011 08:51:50 +0000 (09:51 +0100)]
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

include/sound/soc-dapm.h

index 7c5465b..602024d 100644 (file)
@@ -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);