Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 1a49519dafa..060d72fe57c 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -338,7 +338,7 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
 
         omapfb_rqueue_lock(fbdev);
         switch (blank) {
-        case VESA_NO_BLANKING:
+        case FB_BLANK_UNBLANK:
                 if (fbdev->state == OMAPFB_SUSPENDED) {
                         if (fbdev->ctrl->resume)
                                 fbdev->ctrl->resume();
@@ -349,7 +349,7 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
                                 do_update = 1;
                 }
                 break;
-        case VESA_POWERDOWN:
+        case FB_BLANK_POWERDOWN:
                 if (fbdev->state == OMAPFB_ACTIVE) {
                         fbdev->panel->disable(fbdev->panel);
                         if (fbdev->ctrl->suspend)
@@ -1818,7 +1818,7 @@ static int omapfb_suspend(struct platform_device *pdev, pm_message_t mesg)
 {
         struct omapfb_device *fbdev = platform_get_drvdata(pdev);
 
-        omapfb_blank(VESA_POWERDOWN, fbdev->fb_info[0]);
+        omapfb_blank(FB_BLANK_POWERDOWN, fbdev->fb_info[0]);
 
         return 0;
 }
@@ -1828,7 +1828,7 @@ static int omapfb_resume(struct platform_device *pdev)
 {
         struct omapfb_device *fbdev = platform_get_drvdata(pdev);
 
-        omapfb_blank(VESA_NO_BLANKING, fbdev->fb_info[0]);
+        omapfb_blank(FB_BLANK_UNBLANK, fbdev->fb_info[0]);
         return 0;
 }