X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fvideo%2Fvfb.c;h=a00da53ec94f464b523f0463fa0eba1d071265fc;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=8b01918a540c95022700c3f8198a2909ded6d958;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index 8b01918a5..a00da53ec 100644
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -496,6 +496,14 @@ int __init vfb_init(void)
 {
 	int ret = 0;
 
+#ifndef MODULE
+	char *option = NULL;
+
+	if (fb_get_options("vfb", &option))
+		return -ENODEV;
+	vfb_setup(option);
+#endif
+
 	if (!vfb_enable)
 		return -ENXIO;
 
@@ -509,6 +517,8 @@ int __init vfb_init(void)
 	return ret;
 }
 
+module_init(vfb_init);
+
 #ifdef MODULE
 static void __exit vfb_exit(void)
 {
@@ -516,7 +526,6 @@ static void __exit vfb_exit(void)
 	driver_unregister(&vfb_driver);
 }
 
-module_init(vfb_init);
 module_exit(vfb_exit);
 
 MODULE_LICENSE("GPL");