drm/omap: Merge omap_dss_device type and output_type fields

[linux.git] / drivers / gpu / drm / omapdrm / dss / venc.c

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index f2cbecfd05b534e5e752fbb51e4a886f9e285ffd..da43b865d9738a1aa9fe5a9b4bd84777f0497673 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -760,7 +760,7 @@ static int venc_init_output(struct venc_device *venc)
 
        out->dev = &venc->pdev->dev;
        out->id = OMAP_DSS_OUTPUT_VENC;
-       out->output_type = OMAP_DISPLAY_TYPE_VENC;
+       out->type = OMAP_DISPLAY_TYPE_VENC;
        out->name = "venc.0";
        out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
        out->ops = &venc_ops;