diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-11 11:46:03 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-11 11:46:03 +0100 |
| commit | a45216547e8925078b18b2a6b539100c3814e973 (patch) | |
| tree | fd07faaf4ad557152d71b336f9304c93075f41ed /drivers/gpu/drm/exynos/exynos_drm_dpi.c | |
| parent | 35dc8aabc8783d6322a59d774af2858e5955d2ab (diff) | |
| parent | 76adb460fd939756db689f238d5c2ddb45469705 (diff) | |
Merge branch 'drm/next/platform' of git://linuxtv.org/pinchartl/media into drm-misc-next
Merge Laurent's drm_platform removal code. Only conflict is with the
drm_pci.h extraction, which allows me to fix up the misplayed
drm_platform_init fumble that 0day and Stephen Rothwell reported.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_dpi.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_dpi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c index ad6b73c7fc59..3aab71a485ba 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c @@ -114,7 +114,6 @@ static int exynos_dpi_create_connector(struct drm_encoder *encoder) } drm_connector_helper_add(connector, &exynos_dpi_connector_helper_funcs); - drm_connector_register(connector); drm_mode_connector_attach_encoder(connector, encoder); return 0; |