This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / video / gbefb.c

diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
index 087a3bc..1dfc1d6 100644 (file)
--- a/drivers/video/gbefb.c
+++ b/drivers/video/gbefb.c
@@ -384,11 +384,11 @@ static int gbefb_blank(int blank, struct fb_info *info)
 {
        /* 0 unblank, 1 blank, 2 no vsync, 3 no hsync, 4 off */
        switch (blank) {
-       case FB_BLANK_UNBLANK:          /* unblank */
+       case 0:         /* unblank */
                gbe_turn_on();
                break;
 
-       case FB_BLANK_NORMAL:           /* blank */
+       case 1:         /* blank */
                gbe_turn_off();
                break;
 
@@ -1018,8 +1018,8 @@ static int gbefb_mmap(struct fb_info *info, struct file *file,
                else
                        phys_size = TILE_SIZE - offset;
 
-               if (remap_pfn_range(vma, addr, phys_addr >> PAGE_SHIFT,
-                                               phys_size, vma->vm_page_prot))
+               if (remap_page_range
+                   (vma, addr, phys_addr, phys_size, vma->vm_page_prot))
                        return -EAGAIN;
 
                offset = 0;
@@ -1084,9 +1084,9 @@ int __init gbefb_init(void)
        int i, ret = 0;
 
 #ifndef MODULE
-       char *options = NULL;
+       char *option = NULL;
 
-       if (fb_get_options("gbefb", &options))
+       if (fb_get_options("gbefb", &option))
                return -ENODEV;
        gbefb_setup(options);
 #endif
@@ -1140,6 +1140,7 @@ int __init gbefb_init(void)
        for (i = 0; i < (gbe_mem_size >> TILE_SHIFT); i++)
                gbe_tiles.cpu[i] = (gbe_mem_phys >> TILE_SHIFT) + i;
 
+       fb_info.currcon = -1;
        fb_info.fbops = &gbefb_ops;
        fb_info.pseudo_palette = pseudo_palette;
        fb_info.flags = FBINFO_DEFAULT;