diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-06-09 12:08:02 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-07-04 10:17:57 +0200 |
| commit | d27d20c88da7d78b389e5e824aff0cdfc9ce203f (patch) | |
| tree | eed6c90e4dece2dbfe7673e627ad6f82e869fae9 /drivers/video | |
| parent | OMAPDSS: DISPC: clean up dispc_mgr_timings_ok (diff) | |
| download | linux-d27d20c88da7d78b389e5e824aff0cdfc9ce203f.tar.xz linux-d27d20c88da7d78b389e5e824aff0cdfc9ce203f.zip | |
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>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/hdmi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/omap2/dss/hdmi.h b/drivers/video/fbdev/omap2/dss/hdmi.h index fbee07816337..1a62dc3fe54e 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi.h +++ b/drivers/video/fbdev/omap2/dss/hdmi.h @@ -142,7 +142,7 @@ enum hdmi_audio_samples_perword { HDMI_AUDIO_ONEWORD_TWOSAMPLES = 1 }; -enum hdmi_audio_sample_size { +enum hdmi_audio_sample_size_omap { HDMI_AUDIO_SAMPLE_16BITS = 0, HDMI_AUDIO_SAMPLE_24BITS = 1 }; @@ -260,7 +260,7 @@ struct hdmi_audio_format { enum hdmi_audio_justify justification; enum hdmi_audio_sample_order sample_order; 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; }; |