Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c
index a982e75..50b78af 100644 (file)
--- a/drivers/video/clps711xfb.c
+++ b/drivers/video/clps711xfb.c
@@ -219,7 +219,6 @@ static struct fb_ops clps7111fb_ops = {
        .fb_fillrect    = cfb_fillrect,
        .fb_copyarea    = cfb_copyarea,
        .fb_imageblit   = cfb_imageblit,
-       .fb_cursor      = soft_cursor,
 };
 
 static int 
@@ -364,6 +363,9 @@ int __init clps711xfb_init(void)
 {
        int err = -ENOMEM;
 
+       if (fb_get_options("clps711xfb", NULL))
+               return -ENODEV;
+
        cfb = kmalloc(sizeof(*cfb), GFP_KERNEL);
        if (!cfb)
                goto out;
@@ -372,7 +374,7 @@ int __init clps711xfb_init(void)
        strcpy(cfb->fix.id, "clps711x");
 
        cfb->fbops              = &clps7111fb_ops;
-       cfb->flags              = FBINFO_FLAG_DEFAULT;
+       cfb->flags              = FBINFO_DEFAULT;
 
        clps711x_guess_lcd_params(cfb);
 
@@ -432,9 +434,7 @@ static void __exit clps711xfb_exit(void)
        }
 }
 
-#ifdef MODULE
 module_init(clps711xfb_init);
-#endif
 module_exit(clps711xfb_exit);
 
 MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");