diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-14 10:51:50 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-14 10:51:50 +0200 |
| commit | 169d5a83f687c37104d51cbaa639bdffca8a1cd3 (patch) | |
| tree | a0d49f301ef9067879eac5194a028288a641a1cd /include/sound | |
| parent | Merge branch 'for-3.0' into for-3.1 (diff) | |
| download | linux-169d5a83f687c37104d51cbaa639bdffca8a1cd3.tar.xz linux-169d5a83f687c37104d51cbaa639bdffca8a1cd3.zip | |
ASoC: Fix mismerge with release branch
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dapm.h | 1 |
1 files changed, 1 insertions, 0 deletions
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); |