vserver 2.0 rc7

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

diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index 2a2a765..b137a3f 100644 (file)
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -72,12 +72,6 @@ static struct fb_fix_screeninfo vfb_fix __initdata = {
 static int vfb_enable __initdata = 0;  /* disabled by default */
 module_param(vfb_enable, bool, 0);
 
-    /*
-     *  Interface used by the world
-     */
-int vfb_init(void);
-int vfb_setup(char *);
-
 static int vfb_check_var(struct fb_var_screeninfo *var,
                         struct fb_info *info);
 static int vfb_set_par(struct fb_info *info);
@@ -379,7 +373,8 @@ static int vfb_mmap(struct fb_info *info, struct file *file,
        return -EINVAL;
 }
 
-int __init vfb_setup(char *options)
+#ifndef MODULE
+static int __init vfb_setup(char *options)
 {
        char *this_opt;
 
@@ -396,6 +391,7 @@ int __init vfb_setup(char *options)
        }
        return 1;
 }
+#endif  /*  MODULE  */
 
     /*
      *  Initialisation
@@ -492,7 +488,7 @@ static struct platform_device vfb_device = {
        }
 };
 
-int __init vfb_init(void)
+static int __init vfb_init(void)
 {
        int ret = 0;