summaryrefslogtreecommitdiffstats
path: root/include/sound/hda_chmap.h
diff options
context:
space:
mode:
authorSubhransu S. Prusty <subhransu.s.prusty@intel.com>2016-03-04 15:29:48 +0100
committerTakashi Iwai <tiwai@suse.de>2016-03-07 15:41:30 +0100
commitf302240da5d5cfc7366dc6994c523aa2aa17c122 (patch)
tree6bb092ed8a949b6a9cf4566dbaa9106e75cdb9bf /include/sound/hda_chmap.h
parentALSA: hda - Register chmap obj as priv data instead of codec (diff)
downloadlinux-f302240da5d5cfc7366dc6994c523aa2aa17c122.tar.xz
linux-f302240da5d5cfc7366dc6994c523aa2aa17c122.zip
ALSA: hda - Use hdac name space for CEA spk alloc structure
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/hda_chmap.h')
-rw-r--r--include/sound/hda_chmap.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/hda_chmap.h b/include/sound/hda_chmap.h
index 713b24526134..d3f80e728593 100644
--- a/include/sound/hda_chmap.h
+++ b/include/sound/hda_chmap.h
@@ -7,7 +7,7 @@
#include <sound/hdaudio.h>
-struct cea_channel_speaker_allocation {
+struct hdac_cea_channel_speaker_allocation {
int ca_index;
int speakers[8];
@@ -23,9 +23,9 @@ struct hdac_chmap_ops {
* for devices that have non-standard mapping requirements.
*/
int (*chmap_cea_alloc_validate_get_type)(struct hdac_chmap *chmap,
- struct cea_channel_speaker_allocation *cap, int channels);
+ struct hdac_cea_channel_speaker_allocation *cap, int channels);
void (*cea_alloc_to_tlv_chmap)
- (struct cea_channel_speaker_allocation *cap,
+ (struct hdac_cea_channel_speaker_allocation *cap,
unsigned int *chmap, int channels);
/* check that the user-given chmap is supported */