diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-04-26 12:01:33 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-04-26 12:01:33 +0200 |
| commit | da398dbd7d871bae332a800f7d194af18a2a9058 (patch) | |
| tree | 2dbdc51bd9caa1539480b3d80d082adfdb8179c3 /sound/soc/codecs/hdac_hda.h | |
| parent | 2792107dc3af29ecc1a9b3dc5bc873dac4b61cd6 (diff) | |
| parent | 8113a85f872003a9f5c58f9f143054b0d8ec73a5 (diff) | |
Merge branch 'linus' into x86/mm, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 { |