summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMayuresh Janorkar <mayur@ti.com>2010-11-29 17:26:57 +0530
committerSamreen <samreen@ti.com>2010-12-01 09:44:43 +0530
commit890d89706657b69a891c3507351037bc98965067 (patch)
tree7a9293ec691922af3d31ca1fd173f5d29e5f9d76
parent63aa39bd67a622833ab3140ad71c29122199dd07 (diff)
OMAPFB: Syncing up with Android
Using omapdss_display_enable in OMAPFB driver Signed-off-by: Mayuresh Janorkar <mayur@ti.com>
-rw-r--r--drivers/video/omap2/omapfb/omapfb-main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 9588661b4256..5cffd8d1dc30 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2023,7 +2023,7 @@ static void omapfb_free_resources(struct omapfb2_device *fbdev)
for (i = 0; i < fbdev->num_displays; i++) {
if (fbdev->displays[i]->state != OMAP_DSS_DISPLAY_DISABLED)
- fbdev->displays[i]->driver->disable(fbdev->displays[i]);
+ omapdss_display_disable(fbdev->displays[i]);
omap_dss_put_device(fbdev->displays[i]);
}
@@ -2501,7 +2501,7 @@ static int omapfb_probe(struct platform_device *pdev)
if (def_display) {
struct omap_dss_driver *dssdrv = def_display->driver;
- r = def_display->driver->enable(def_display);
+ r = omapdss_display_enable(def_display);
if (r) {
dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
def_display->name);