drm/omap: Merge omap_dss_device type and output_type fields

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

diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index 0ac400a521f33be1cda6eaec16e92ec5cdc3bfae..f25ecfd26534d0a1ad57c92853ac3441a6006a0b 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -33,7 +33,7 @@ int omapdss_device_init_output(struct omap_dss_device *out)
                return PTR_ERR(out->next);
        }
 
-       if (out->next && out->output_type != out->next->type) {
+       if (out->next && out->type != out->next->type) {
                dev_err(out->dev, "output type and display type don't match\n");
                return -EINVAL;
        }