fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/video/fm2fb.c b/drivers/video/fm2fb.c
index 3adb65d..70ff55b 100644 (file)
--- a/drivers/video/fm2fb.c
+++ b/drivers/video/fm2fb.c
@@ -2,7 +2,7 @@
  *  linux/drivers/video/fm2fb.c -- BSC FrameMaster II/Rainbow II frame buffer
  *                                device
  *
- *     Copyright (C) 1998 Steffen A. Mork (mork@ls7.cs.uni-dortmund.de)
+ *     Copyright (C) 1998 Steffen A. Mork (linux-dev@morknet.de)
  *     Copyright (C) 1999 Geert Uytterhoeven
  *
  *  Written for 2.0.x by Steffen A. Mork
@@ -172,7 +172,6 @@ static struct fb_ops fm2fb_ops = {
        .fb_fillrect    = cfb_fillrect,
        .fb_copyarea    = cfb_copyarea,
        .fb_imageblit   = cfb_imageblit,
-       .fb_cursor      = soft_cursor,
 };
 
     /*
@@ -284,6 +283,7 @@ static int __devinit fm2fb_probe(struct zorro_dev *z,
 
        if (register_framebuffer(info) < 0) {
                fb_dealloc_cmap(&info->cmap);
+               iounmap(info->screen_base);
                framebuffer_release(info);
                zorro_release_device(z);
                return -EINVAL;
@@ -292,18 +292,7 @@ static int __devinit fm2fb_probe(struct zorro_dev *z,
        return 0;
 }
 
-int __init fm2fb_setup(char *options);
-
-int __init fm2fb_init(void)
-{
-       char *option = NULL;
-
-       if (fb_get_options("fm2fb", &option))
-               return -ENODEV;
-       fm2fb_setup(option);
-       return zorro_register_driver(&fm2fb_driver);
-}
-
+int __init fm2fb_setup(char *options)
 {
        char *this_opt;
 
@@ -319,5 +308,15 @@ int __init fm2fb_init(void)
        return 0;
 }
 
+int __init fm2fb_init(void)
+{
+       char *option = NULL;
+
+       if (fb_get_options("fm2fb", &option))
+               return -ENODEV;
+       fm2fb_setup(option);
+       return zorro_register_driver(&fm2fb_driver);
+}
+
 module_init(fm2fb_init);
 MODULE_LICENSE("GPL");