vserver 2.0 rc7

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

diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 42e18fd..da8004e 100644 (file)
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -31,7 +31,7 @@ struct tridentfb_par {
        void __iomem * io_virt; //iospace virtual memory address
 };
 
-unsigned char eng_oper;                //engine operation...
+static unsigned char eng_oper;         //engine operation...
 static struct fb_ops tridentfb_ops;
 
 static struct tridentfb_par default_par;
@@ -91,7 +91,7 @@ module_param(crt, int, 0);
 static int chip3D;
 static int chipcyber;
 
-int is3Dchip(int id)
+static int is3Dchip(int id)
 {
        return  ((id == BLADE3D) || (id == CYBERBLADEE4) ||
                 (id == CYBERBLADEi7) || (id == CYBERBLADEi7D) ||
@@ -104,7 +104,7 @@ int is3Dchip(int id)
                 (id == CYBERBLADEXPAi1));
 }
 
-int iscyber(int id)
+static int iscyber(int id)
 {
        switch (id) {
                case CYBER9388:         
@@ -1163,7 +1163,7 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
        fb_info.var = default_var;
        fb_info.device = &dev->dev;
        if (register_framebuffer(&fb_info) < 0) {
-               output("Could not register Trident framebuffer\n");
+               printk(KERN_ERR "tridentfb: could not register Trident framebuffer\n");
                return -EINVAL;
        }
        output("fb%d: %s frame buffer device %dx%d-%dbpp\n",
@@ -1216,33 +1216,13 @@ static struct pci_driver tridentfb_pci_driver = {
        .remove         = __devexit_p(trident_pci_remove)
 };
 
-int tridentfb_setup(char *options);
-
-int __init tridentfb_init(void)
-{
-#ifndef MODULE
-       char *option = NULL;
-
-       if (fb_get_options("tridentfb", &option))
-               return -ENODEV;
-       tridentfb_setup(option);
-#endif
-       output("Trident framebuffer %s initializing\n", VERSION);
-       return pci_module_init(&tridentfb_pci_driver);
-}
-
-void __exit tridentfb_exit(void)
-{
-       pci_unregister_driver(&tridentfb_pci_driver);
-}
-
-
 /*
  * Parse user specified options (`video=trident:')
  * example:
  *     video=trident:800x600,bpp=16,noaccel
  */
-int tridentfb_setup(char *options)
+#ifndef MODULE
+static int tridentfb_setup(char *options)
 {
        char * opt;
        if (!options || !*options)
@@ -1272,6 +1252,25 @@ int tridentfb_setup(char *options)
        }
        return 0;
 }
+#endif
+
+static int __init tridentfb_init(void)
+{
+#ifndef MODULE
+       char *option = NULL;
+
+       if (fb_get_options("tridentfb", &option))
+               return -ENODEV;
+       tridentfb_setup(option);
+#endif
+       output("Trident framebuffer %s initializing\n", VERSION);
+       return pci_register_driver(&tridentfb_pci_driver);
+}
+
+static void __exit tridentfb_exit(void)
+{
+       pci_unregister_driver(&tridentfb_pci_driver);
+}
 
 static struct fb_ops tridentfb_ops = {
        .owner  = THIS_MODULE,