aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_crtc.c4
-rw-r--r--drivers/gpu/drm/omapdrm/omap_drv.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index b2ab2f5d3cb9..4cec678dba94 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -95,7 +95,7 @@ static struct omap_crtc *omap_crtcs[8];
95 95
96/* we can probably ignore these until we support command-mode panels: */ 96/* we can probably ignore these until we support command-mode panels: */
97static int omap_crtc_connect(struct omap_overlay_manager *mgr, 97static int omap_crtc_connect(struct omap_overlay_manager *mgr,
98 struct omap_dss_output *dst) 98 struct omap_dss_device *dst)
99{ 99{
100 if (mgr->output) 100 if (mgr->output)
101 return -EINVAL; 101 return -EINVAL;
@@ -110,7 +110,7 @@ static int omap_crtc_connect(struct omap_overlay_manager *mgr,
110} 110}
111 111
112static void omap_crtc_disconnect(struct omap_overlay_manager *mgr, 112static void omap_crtc_disconnect(struct omap_overlay_manager *mgr,
113 struct omap_dss_output *dst) 113 struct omap_dss_device *dst)
114{ 114{
115 mgr->output->manager = NULL; 115 mgr->output->manager = NULL;
116 mgr->output = NULL; 116 mgr->output = NULL;
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index c65dd0d6b01d..78a78c6ea576 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -259,7 +259,7 @@ static int omap_modeset_init(struct drm_device *dev)
259 struct drm_encoder *encoder = priv->encoders[i]; 259 struct drm_encoder *encoder = priv->encoders[i];
260 struct omap_dss_device *dssdev = 260 struct omap_dss_device *dssdev =
261 omap_encoder_get_dssdev(encoder); 261 omap_encoder_get_dssdev(encoder);
262 struct omap_dss_output *output; 262 struct omap_dss_device *output;
263 263
264 output = omapdss_find_output_from_display(dssdev); 264 output = omapdss_find_output_from_display(dssdev);
265 265