diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/hdmi.h')
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/hdmi.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi.h b/drivers/gpu/drm/omapdrm/dss/hdmi.h index 63e711545865..fb6cccd02374 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi.h +++ b/drivers/gpu/drm/omapdrm/dss/hdmi.h | |||
@@ -181,7 +181,7 @@ struct hdmi_video_format { | |||
181 | }; | 181 | }; |
182 | 182 | ||
183 | struct hdmi_config { | 183 | struct hdmi_config { |
184 | struct omap_video_timings timings; | 184 | struct videomode vm; |
185 | struct hdmi_avi_infoframe infoframe; | 185 | struct hdmi_avi_infoframe infoframe; |
186 | enum hdmi_core_hdmi_dvi hdmi_dvi_mode; | 186 | enum hdmi_core_hdmi_dvi hdmi_dvi_mode; |
187 | }; | 187 | }; |
@@ -298,11 +298,11 @@ int hdmi_wp_set_pll_pwr(struct hdmi_wp_data *wp, enum hdmi_pll_pwr val); | |||
298 | void hdmi_wp_video_config_format(struct hdmi_wp_data *wp, | 298 | void hdmi_wp_video_config_format(struct hdmi_wp_data *wp, |
299 | struct hdmi_video_format *video_fmt); | 299 | struct hdmi_video_format *video_fmt); |
300 | void hdmi_wp_video_config_interface(struct hdmi_wp_data *wp, | 300 | void hdmi_wp_video_config_interface(struct hdmi_wp_data *wp, |
301 | struct omap_video_timings *timings); | 301 | struct videomode *vm); |
302 | void hdmi_wp_video_config_timing(struct hdmi_wp_data *wp, | 302 | void hdmi_wp_video_config_timing(struct hdmi_wp_data *wp, |
303 | struct omap_video_timings *timings); | 303 | struct videomode *vm); |
304 | void hdmi_wp_init_vid_fmt_timings(struct hdmi_video_format *video_fmt, | 304 | void hdmi_wp_init_vid_fmt_timings(struct hdmi_video_format *video_fmt, |
305 | struct omap_video_timings *timings, struct hdmi_config *param); | 305 | struct videomode *vm, struct hdmi_config *param); |
306 | int hdmi_wp_init(struct platform_device *pdev, struct hdmi_wp_data *wp); | 306 | int hdmi_wp_init(struct platform_device *pdev, struct hdmi_wp_data *wp); |
307 | phys_addr_t hdmi_wp_get_audio_dma_addr(struct hdmi_wp_data *wp); | 307 | phys_addr_t hdmi_wp_get_audio_dma_addr(struct hdmi_wp_data *wp); |
308 | 308 | ||