vserver 1.9.3

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

diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c
index 7e0353a..dd6b16c 100644 (file)
--- a/drivers/video/igafb.c
+++ b/drivers/video/igafb.c
@@ -357,7 +357,7 @@ static int __init iga_init(struct fb_info *info, struct iga_par *par)
                 video_cmap_len = 256;
 
        info->fbops = &igafb_ops;
-       info->flags = FBINFO_FLAG_DEFAULT;
+       info->flags = FBINFO_DEFAULT;
 
        fb_alloc_cmap(&info->cmap, video_cmap_len, 0);
 
@@ -381,6 +381,9 @@ int __init igafb_init(void)
        unsigned long addr;
        int size, iga2000 = 0;
 
+       if (fb_get_options("igafb", NULL))
+               return -ENODEV;
+
         /* Do not attach when we have a serial console. */
         if (!con_is_present())
                 return -ENXIO;
@@ -572,4 +575,5 @@ int __init igafb_setup(char *options)
     return 0;
 }
 
+module_init(igafb_init);
 MODULE_LICENSE("GPL");