This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c
index 947ddfb..1154400 100644 (file)
--- a/drivers/video/skeletonfb.c
+++ b/drivers/video/skeletonfb.c
@@ -539,7 +539,13 @@ int __init xxxfb_init(void)
     info.fbops = &xxxfb_ops;
     info.fix = xxxfb_fix;
     info.pseudo_palette = pseudo_palette;
-    info.flags = FBINFO_FLAG_DEFAULT;
+
+    /*
+     * Set up flags to indicate what sort of acceleration your
+     * driver can provide (pan/wrap/copyarea/etc.) and whether it
+     * is a module -- see FBINFO_* in include/linux/fb.h
+     */
+    info.flags = FBINFO_DEFAULT;
     info.par = current_par;
 
     /*
@@ -576,6 +582,17 @@ int __init xxxfb_init(void)
 
 static void __exit xxxfb_cleanup(void)
 {
+    /*
+     *  For kernel boot options (in 'video=xxxfb:<options>' format)
+     */
+#ifndef MODULE
+    char *option = NULL;
+
+    if (fb_get_options("xxxfb", &option))
+           return -ENODEV;
+    xxxfb_setup(option);
+#endif
+
     /*
      *  If your driver supports multiple boards, you should unregister and
      *  clean up all instances.
@@ -633,9 +650,7 @@ static struct fb_ops xxxfb_ops = {
      *  Modularization
      */
 
-#ifdef MODULE
 module_init(xxxfb_init);
-#endif 
 module_exit(xxxfb_cleanup);
 
 MODULE_LICENSE("GPL");