summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-11-21 14:58:13 +0100
committerMark Brown <broonie@kernel.org>2015-11-21 14:58:13 +0100
commit60da3efbf1279c7e1b6a8bd1f848626b194748e6 (patch)
tree48744e42070575d1343057c500ba227e3f09a7ba /include/sound
parentASoC: Intel: pass correct parameter in sst_alloc_stream_mrfld() (diff)
parentALSA: hdac: structure definition for ext_dma_params (diff)
downloadlinux-60da3efbf1279c7e1b6a8bd1f848626b194748e6.tar.xz
linux-60da3efbf1279c7e1b6a8bd1f848626b194748e6.zip
Merge branch 'topic/hdac' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/hdaudio_ext.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/sound/hdaudio_ext.h b/include/sound/hdaudio_ext.h
index a4cadd9c297a..425af0674557 100644
--- a/include/sound/hdaudio_ext.h
+++ b/include/sound/hdaudio_ext.h
@@ -186,9 +186,15 @@ struct hdac_ext_device {
/* codec ops */
struct hdac_ext_codec_ops ops;
+ struct snd_card *card;
+ void *scodec;
void *private_data;
};
+struct hdac_ext_dma_params {
+ u32 format;
+ u8 stream_tag;
+};
#define to_ehdac_device(dev) (container_of((dev), \
struct hdac_ext_device, hdac))
/*