Merge remote-tracking branches 'regulator/fix/email' and 'regulator/fix/qcom-smd...

[deliverable/linux.git] / drivers / gpu / drm / rcar-du / rcar_du_encoder.c

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
index 55149e9ce28ec3ddf8d8491fef4f132556bdb369..ab8645c57e2d5f94a0a36b41910ef1db6861d638 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
@@ -19,7 +19,6 @@
 
 #include "rcar_du_drv.h"
 #include "rcar_du_encoder.h"
-#include "rcar_du_hdmicon.h"
 #include "rcar_du_hdmienc.h"
 #include "rcar_du_kms.h"
 #include "rcar_du_lvdscon.h"
@@ -174,7 +173,7 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu,
                break;
 
        case DRM_MODE_ENCODER_TMDS:
-               ret = rcar_du_hdmi_connector_init(rcdu, renc);
+               /* connector managed by the bridge driver */
                break;
 
        default: