X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fvideo%2Fq40fb.c;h=71b69da0c40d761b36f1891f02b2448a1caac7de;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=0c7b267e491820f4afbeae8544ed94bd698e31dd;hpb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;p=linux-2.6.git

diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index 0c7b267e4..71b69da0c 100644
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -105,7 +105,7 @@ static int __init q40fb_probe(struct device *device)
 	info->var = q40fb_var;
 	info->fix = q40fb_fix;
 	info->fbops = &q40fb_ops;
-	info->flags = FBINFO_FLAG_DEFAULT;  /* not as module for now */
+	info->flags = FBINFO_DEFAULT;  /* not as module for now */
 	info->pseudo_palette = info->par;
 	info->par = NULL;
 	info->screen_base = (char *) q40fb_fix.smem_start;
@@ -143,6 +143,9 @@ int __init q40fb_init(void)
 {
 	int ret = 0;
 
+	if (fb_get_options("q40fb", NULL))
+		return -ENODEV;
+
 	ret = driver_register(&q40fb_driver);
 
 	if (!ret) {
@@ -153,4 +156,5 @@ int __init q40fb_init(void)
 	return ret;
 }
 
+module_init(q40fb_init);
 MODULE_LICENSE("GPL");