diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 10:07:58 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 10:07:58 -0400 |
| commit | a36b32402a805033beed752ea85c5ed62586fe35 (patch) | |
| tree | 10cfb5c2f9f16cd9c8c9c8d49cad4186f0d65bd2 /include | |
| parent | 23af7b0bba404325755d35bfff64307fa23071e1 (diff) | |
| parent | 7f08a89862b96d84c6dfe6c242eb010084e51d3b (diff) | |
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-next
Diffstat (limited to 'include')
| -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 e1ef63d4a5c4..44a30b108683 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
| @@ -488,6 +488,7 @@ struct snd_soc_dapm_path { | |||
| 488 | /* status */ | 488 | /* status */ |
| 489 | u32 connect:1; /* source and sink widgets are connected */ | 489 | u32 connect:1; /* source and sink widgets are connected */ |
| 490 | u32 walked:1; /* path has been walked */ | 490 | u32 walked:1; /* path has been walked */ |
| 491 | u32 walking:1; /* path is in the process of being walked */ | ||
| 491 | u32 weak:1; /* path ignored for power management */ | 492 | u32 weak:1; /* path ignored for power management */ |
| 492 | 493 | ||
| 493 | int (*connected)(struct snd_soc_dapm_widget *source, | 494 | int (*connected)(struct snd_soc_dapm_widget *source, |