summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/core.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-10-18 11:02:51 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-10-18 11:02:51 +0300
commit9253d2d861129b2290ac6523ee59d460dbfc7928 (patch)
tree992d84c671c98c446d5a4aaa9973972e58b5879d /drivers/video/omap2/dss/core.c
parentda6c56873927418aba585038e5c4d3d72a4d9b6c (diff)
parent97fbd0fc9f36105c68cf235fd9bffb3e517d2e06 (diff)
downloadop-kernel-dev-9253d2d861129b2290ac6523ee59d460dbfc7928.zip
op-kernel-dev-9253d2d861129b2290ac6523ee59d460dbfc7928.tar.gz
Merge branch '3.8/dss-version'
Merge omapdss code to remove cpu_is_* checks from the driver.
Diffstat (limited to 'drivers/video/omap2/dss/core.c')
-rw-r--r--drivers/video/omap2/dss/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index d1ed2b4..00aa026 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -232,7 +232,7 @@ static int __init omap_dss_probe(struct platform_device *pdev)
core.pdev = pdev;
- dss_features_init();
+ dss_features_init(pdata->version);
dss_apply_init();
OpenPOWER on IntegriCloud