Commit d27d20c8 authored by Tomi Valkeinen's avatar Tomi Valkeinen

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent eadd33bb
...@@ -142,7 +142,7 @@ enum hdmi_audio_samples_perword { ...@@ -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 { ...@@ -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;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment