This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index f61cd6e..baa4fa0 100644 (file)
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -1307,13 +1307,16 @@ static int amifb_set_par(struct fb_info *info)
                info->fix.ywrapstep = 1;
                info->fix.xpanstep = 0;
                info->fix.ypanstep = 0;
+               info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YWRAP |
+                   FBINFO_READS_FAST; /* override SCROLL_REDRAW */
        } else {
                info->fix.ywrapstep = 0;
-               if (par->vmode &= FB_VMODE_SMOOTH_XPAN)
+               if (par->vmode & FB_VMODE_SMOOTH_XPAN)
                        info->fix.xpanstep = 1;
                else
                        info->fix.xpanstep = 16<<maxfmode;
                info->fix.ypanstep = 1;
+               info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
        }
        return 0;
 }
@@ -2254,6 +2257,13 @@ int __init amifb_init(void)
        u_long chipptr;
        u_int defmode;
 
+#ifndef MODULE
+       char *option = NULL;
+
+       if (fb_get_options("amifb", &option))
+               return -ENODEV;
+       amifb_setup(option);
+#endif
        if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_VIDEO))
                return -ENXIO;
 
@@ -2351,7 +2361,7 @@ default_chipset:
         */
 
        {
-       u_long tmp = DIVUL(200E9, amiga_eclock);
+       u_long tmp = DIVUL(200000000000ULL, amiga_eclock);
 
        pixclock[TAG_SHRES] = (tmp + 4) / 8;    /* SHRES:  35 ns / 28 MHz */
        pixclock[TAG_HIRES] = (tmp + 2) / 4;    /* HIRES:  70 ns / 14 MHz */
@@ -2382,7 +2392,7 @@ default_chipset:
 
        fb_info.fbops = &amifb_ops;
        fb_info.par = &currentpar;
-       fb_info.flags = FBINFO_FLAG_DEFAULT;
+       fb_info.flags = FBINFO_DEFAULT;
 
        if (!fb_find_mode(&fb_info.var, &fb_info, mode_option, ami_modedb,
                          NUM_TOTAL_MODES, &ami_modedb[defmode], 4)) {
@@ -3811,14 +3821,11 @@ static void ami_rebuild_copper(void)
 }
 
 
+module_init(amifb_init);
+
 #ifdef MODULE
 MODULE_LICENSE("GPL");
 
-int init_module(void)
-{
-       return amifb_init();
-}
-
 void cleanup_module(void)
 {
        unregister_framebuffer(&fb_info);