diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-11-20 15:46:04 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-11-20 15:46:04 -0500 |
| commit | a69862d8d04e4877965cc938140c9f8e6da0b827 (patch) | |
| tree | 667cace5c2fad872871e4d24d0c895664f0e0bc6 /include/sound | |
| parent | 0f32fd1900e6b972f289416dbd75e92772b630cb (diff) | |
| parent | 01cb156edbbd4e6c4fd8db0d05f18c62c424f9aa (diff) | |
Merge branch 'for-linus' into test/usb-resume
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dpcm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h index 2883a7a6f9f3..98f2ade0266e 100644 --- a/include/sound/soc-dpcm.h +++ b/include/sound/soc-dpcm.h | |||
| @@ -102,6 +102,8 @@ struct snd_soc_dpcm_runtime { | |||
| 102 | /* state and update */ | 102 | /* state and update */ |
| 103 | enum snd_soc_dpcm_update runtime_update; | 103 | enum snd_soc_dpcm_update runtime_update; |
| 104 | enum snd_soc_dpcm_state state; | 104 | enum snd_soc_dpcm_state state; |
| 105 | |||
| 106 | int trigger_pending; /* trigger cmd + 1 if pending, 0 if not */ | ||
| 105 | }; | 107 | }; |
| 106 | 108 | ||
| 107 | /* can this BE stop and free */ | 109 | /* can this BE stop and free */ |