diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-17 09:24:35 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-17 09:24:35 -0400 |
| commit | 753e23ea588d353da9d0a2672828336453607265 (patch) | |
| tree | a0eb4875ecde41725fe890e27f52d69812031ea1 /include/sound | |
| parent | c999836d37c6c1125e856f68877ae13952baa61a (diff) | |
| parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
Merge tag 'v3.9-rc7' into asoc-dma
Linux 3.9-rc7
Diffstat (limited to 'include/sound')
| -rw-r--r--[-rwxr-xr-x] | include/sound/max98090.h | 0 | ||||
| -rw-r--r-- | include/sound/soc-dapm.h | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/max98090.h b/include/sound/max98090.h index 95efb13f8478..95efb13f8478 100755..100644 --- a/include/sound/max98090.h +++ b/include/sound/max98090.h | |||
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index d4c004929ae5..d4609029f014 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, |