diff options
| author |  Takashi Iwai <tiwai@suse.de>
| 2014-11-20 21:46:04 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de>
| 2014-11-20 21:46:04 +0100 |
| commit | a69862d8d04e4877965cc938140c9f8e6da0b827 (patch) | |
| tree | 667cace5c2fad872871e4d24d0c895664f0e0bc6 /include/sound | |
| parent | ALSA: hda/realtek - Clean up mute/mic GPIO LED handling (diff) | |
| parent | ALSA: usb-audio: Use snd_usb_ctl_msg() for Native Instruments quirk (diff) | |
| download | linux-a69862d8d04e4877965cc938140c9f8e6da0b827.tar.gz linux-a69862d8d04e4877965cc938140c9f8e6da0b827.tar.bz2 linux-a69862d8d04e4877965cc938140c9f8e6da0b827.zip | |
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 { /* state and update */ enum snd_soc_dpcm_update runtime_update; enum snd_soc_dpcm_state state; + + int trigger_pending; /* trigger cmd + 1 if pending, 0 if not */ }; /* can this BE stop and free */ |