aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/exynos/exynos_drm_dsi.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-07-29 14:49:36 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-07-29 14:49:36 -0400
commit4dac3edfe68e5e1b3c2216b84ba160572420fa40 (patch)
tree924c0d117dbcc6d374eea603ed64e627b35b043b /drivers/gpu/drm/exynos/exynos_drm_dsi.c
parent487777673e355ab9f0b7cac4ad1207be9d36156f (diff)
parente05444be705b5c7c7f85d7722b6f97f3a6732d54 (diff)
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
Pull in drm-next with Dave's DP MST support so that I can merge some conflicting patches which also touch the driver load sequencing around interrupt handling. Conflicts: drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_dp.c Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_dsi.c')
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_dsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 6302aa64f6c1..2df3592166de 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -1246,7 +1246,7 @@ static int exynos_dsi_create_connector(struct exynos_drm_display *display,
1246 } 1246 }
1247 1247
1248 drm_connector_helper_add(connector, &exynos_dsi_connector_helper_funcs); 1248 drm_connector_helper_add(connector, &exynos_dsi_connector_helper_funcs);
1249 drm_sysfs_connector_add(connector); 1249 drm_connector_register(connector);
1250 drm_mode_connector_attach_encoder(connector, encoder); 1250 drm_mode_connector_attach_encoder(connector, encoder);
1251 1251
1252 return 0; 1252 return 0;