Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6
[linux-2.6.git] / drivers / video / omap2 / omapfb / omapfb.h
index e12d384..c0bdc9b 100644 (file)
@@ -181,13 +181,10 @@ static inline void omapfb_unlock(struct omapfb2_device *fbdev)
 static inline int omapfb_overlay_enable(struct omap_overlay *ovl,
                int enable)
 {
-       struct omap_overlay_info info;
-
-       ovl->get_overlay_info(ovl, &info);
-       if (info.enabled == enable)
-               return 0;
-       info.enabled = enable;
-       return ovl->set_overlay_info(ovl, &info);
+       if (enable)
+               return ovl->enable(ovl);
+       else
+               return ovl->disable(ovl);
 }
 
 static inline struct omapfb2_mem_region *