mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
OMAPDSS: HDMI: fix name conflict
OMAP HDMI driver has an 'enum hdmi_audio_sample_size', which conflicts with the common include/linux/hdmi.h. Change the name of the OMAP specific enum with '_omap" postfix. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
parent
eadd33bb95
commit
d27d20c88d
1 changed files with 2 additions and 2 deletions
|
@ -142,7 +142,7 @@ enum hdmi_audio_samples_perword {
|
||||||
HDMI_AUDIO_ONEWORD_TWOSAMPLES = 1
|
HDMI_AUDIO_ONEWORD_TWOSAMPLES = 1
|
||||||
};
|
};
|
||||||
|
|
||||||
enum hdmi_audio_sample_size {
|
enum hdmi_audio_sample_size_omap {
|
||||||
HDMI_AUDIO_SAMPLE_16BITS = 0,
|
HDMI_AUDIO_SAMPLE_16BITS = 0,
|
||||||
HDMI_AUDIO_SAMPLE_24BITS = 1
|
HDMI_AUDIO_SAMPLE_24BITS = 1
|
||||||
};
|
};
|
||||||
|
@ -260,7 +260,7 @@ struct hdmi_audio_format {
|
||||||
enum hdmi_audio_justify justification;
|
enum hdmi_audio_justify justification;
|
||||||
enum hdmi_audio_sample_order sample_order;
|
enum hdmi_audio_sample_order sample_order;
|
||||||
enum hdmi_audio_samples_perword samples_per_word;
|
enum hdmi_audio_samples_perword samples_per_word;
|
||||||
enum hdmi_audio_sample_size sample_size;
|
enum hdmi_audio_sample_size_omap sample_size;
|
||||||
enum hdmi_audio_blk_strt_end_sig en_sig_blk_strt_end;
|
enum hdmi_audio_blk_strt_end_sig en_sig_blk_strt_end;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue