Merge tag 'v3.16-rc1' into i2c/for-next

[karo-tx-linux.git] / drivers / gpu / drm / nouveau / dispnv04 / tvnv17.c

diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
index acef48f4a4ea2c62c75172ae38fb7f85646d39fa..195bd8e86c6a523615679273bf71bc4fbc5aa6cc 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
@@ -612,8 +612,7 @@ static void nv17_tv_commit(struct drm_encoder *encoder)
        helper->dpms(encoder, DRM_MODE_DPMS_ON);
 
        NV_INFO(drm, "Output %s is running on CRTC %d using output %c\n",
-               drm_get_connector_name(
-                       &nouveau_encoder_connector_get(nv_encoder)->base),
+               nouveau_encoder_connector_get(nv_encoder)->base.name,
                nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
 }