diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-04 18:30:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-04 18:30:01 +0100 |
| commit | 986a622df307644af14618bee54c901aa74816da (patch) | |
| tree | 6da87812b9120634381e3e3987e115f90bd562e0 /include/sound/soc-dapm.h | |
| parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
| parent | 28e5ca73ef9072ed58dbb81cfff6f908be8e3cd4 (diff) | |
| download | blackbird-op-linux-986a622df307644af14618bee54c901aa74816da.tar.gz blackbird-op-linux-986a622df307644af14618bee54c901aa74816da.zip | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'include/sound/soc-dapm.h')
| -rw-r--r-- | include/sound/soc-dapm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 385c6329a967..3e479f4e15f5 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -311,6 +311,8 @@ struct device; #define SND_SOC_DAPM_POST_PMD 0x8 /* after widget power down */ #define SND_SOC_DAPM_PRE_REG 0x10 /* before audio path setup */ #define SND_SOC_DAPM_POST_REG 0x20 /* after audio path setup */ +#define SND_SOC_DAPM_WILL_PMU 0x40 /* called at start of sequence */ +#define SND_SOC_DAPM_WILL_PMD 0x80 /* called at start of sequence */ #define SND_SOC_DAPM_PRE_POST_PMD \ (SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD) @@ -479,7 +481,6 @@ struct snd_soc_dapm_route { /* dapm audio path between two widgets */ struct snd_soc_dapm_path { const char *name; - const char *long_name; /* source (input) and sink (output) widgets */ struct snd_soc_dapm_widget *source; |
