vserver 1.9.3

[linux-2.6.git] / drivers / video / pmagb-b-fb.c

diff --git a/drivers/video/pmagb-b-fb.c b/drivers/video/pmagb-b-fb.c
index 16847d8..7847bed 100644 (file)
--- a/drivers/video/pmagb-b-fb.c
+++ b/drivers/video/pmagb-b-fb.c
@@ -145,7 +145,7 @@ int __init pmagbbfb_init_one(int slot)
        info->var = pmagbbfb_defined;
        info->fix = pmagbbfb_fix;
        info->screen_base = pmagbbfb_fix.smem_start; 
-       info->flags = FBINFO_FLAG_DEFAULT;
+       info->flags = FBINFO_DEFAULT;
 
        fb_alloc_cmap(&fb_info.cmap, 256, 0);
 
@@ -163,6 +163,9 @@ int __init pmagbbfb_init(void)
        int sid;
        int found = 0;
 
+       if (fb_get_options("pmagbbfb", NULL))
+               return -ENODEV;
+
        if (TURBOCHANNEL) {
                while ((sid = search_tc_card("PMAGB-BA")) >= 0) {
                        found = 1;
@@ -175,4 +178,5 @@ int __init pmagbbfb_init(void)
        }
 }
 
+module_init(pmagbbfb_init);
 MODULE_LICENSE("GPL");