diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-04-13 11:09:40 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-04-13 11:09:46 +0300 |
| commit | 99fff44fe339b21c6a4ddd6c1239e587dd439cd3 (patch) | |
| tree | 132e59f06c467786f21b9b67a5a031936850b384 /sound/soc/codecs/hdac_hda.h | |
| parent | 6b580f523172f2c738b661069a57c23c74a75f88 (diff) | |
| parent | 183ab39eb0ea9879bb68422a83e65f750f3192f0 (diff) | |
| download | linux-99fff44fe339b21c6a4ddd6c1239e587dd439cd3.tar.xz | |
Merge branch 'for-linus' into for-next
Back-merge the 5.1 devel branch for the further HD-audio development.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/codecs/hdac_hda.h')
| -rw-r--r-- | sound/soc/codecs/hdac_hda.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/hdac_hda.h b/sound/soc/codecs/hdac_hda.h index e444ef593360..6b1bd4f428e7 100644 --- a/sound/soc/codecs/hdac_hda.h +++ b/sound/soc/codecs/hdac_hda.h @@ -8,6 +8,7 @@ struct hdac_hda_pcm { int stream_tag[2]; + unsigned int format_val[2]; }; struct hdac_hda_priv { |