vserver 1.9.5.x5

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

diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index a00da53..2a2a765 100644 (file)
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -35,7 +35,7 @@
 
 static void *videomemory;
 static u_long videomemorysize = VIDEOMEMSIZE;
-MODULE_PARM(videomemorysize, "l");
+module_param(videomemorysize, ulong, 0);
 
 static struct fb_var_screeninfo vfb_default __initdata = {
        .xres =         640,
@@ -70,7 +70,7 @@ static struct fb_fix_screeninfo vfb_fix __initdata = {
 };
 
 static int vfb_enable __initdata = 0;  /* disabled by default */
-MODULE_PARM(vfb_enable, "i");
+module_param(vfb_enable, bool, 0);
 
     /*
      *  Interface used by the world
@@ -430,7 +430,7 @@ static int __init vfb_probe(struct device *device)
        if (!info)
                goto err;
 
-       info->screen_base = videomemory;
+       info->screen_base = (char __iomem *)videomemory;
        info->fbops = &vfb_ops;
 
        retval = fb_find_mode(&info->var, info, NULL,