diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-12 21:19:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-12 21:19:05 +0000 |
| commit | 05a76e8101828950a4e7faa3178d418d7fad3db7 (patch) | |
| tree | 405116936da312164edb683101a603d385fec40e /include/sound | |
| parent | 2be2d57986431626e905ee344086affa44c5bb9b (diff) | |
| parent | 1e02dac395fadfff1f2c6bd90f1180f64a9cbebe (diff) | |
| download | linux-05a76e8101828950a4e7faa3178d418d7fad3db7.tar.gz linux-05a76e8101828950a4e7faa3178d418d7fad3db7.tar.bz2 linux-05a76e8101828950a4e7faa3178d418d7fad3db7.zip | |
Merge branch 'topic/hdac-hdmi' of https://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.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/hdaudio_ext.h b/include/sound/hdaudio_ext.h index ca00130cb028..9c14e21dda85 100644 --- a/include/sound/hdaudio_ext.h +++ b/include/sound/hdaudio_ext.h @@ -193,7 +193,7 @@ struct hda_dai_map { * @pvt_data - private data, for asoc contains asoc codec object */ struct hdac_ext_device { - struct hdac_device hdac; + struct hdac_device hdev; struct hdac_ext_bus *ebus; /* soc-dai to nid map */ @@ -213,7 +213,7 @@ struct hdac_ext_dma_params { u8 stream_tag; }; #define to_ehdac_device(dev) (container_of((dev), \ - struct hdac_ext_device, hdac)) + struct hdac_ext_device, hdev)) /* * HD-audio codec base driver */ |