vserver 2.0 rc7

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

diff --git a/drivers/video/radeonfb.c b/drivers/video/radeonfb.c
index 9a2e3ad..c463870 100644 (file)
--- a/drivers/video/radeonfb.c
+++ b/drivers/video/radeonfb.c
@@ -657,14 +657,17 @@ static __inline__ int _max(int val1, int val2)
 /*
  * globals
  */
-        
-static char *mode_option __initdata;
+
+#ifndef MODULE
+static char *mode_option;
+#endif
+
 static char noaccel = 0;
 static char mirror = 0;
-static int panel_yres __initdata = 0;
-static char force_dfp __initdata = 0;
+static int panel_yres = 0;
+static char force_dfp = 0;
 static struct radeonfb_info *board_list = NULL;
-static char nomtrr __initdata = 0;
+static char nomtrr = 0;
 
 /*
  * prototypes
@@ -2104,7 +2107,7 @@ static void radeon_write_mode (struct radeonfb_info *rinfo,
 
 
        if (rinfo->arch == RADEON_M6) {
-               for (i=0; i<8; i++)
+               for (i=0; i<7; i++)
                        OUTREG(common_regs_m6[i].reg, common_regs_m6[i].val);
        } else {
                for (i=0; i<9; i++)
@@ -3109,28 +3112,8 @@ static struct pci_driver radeonfb_driver = {
        .remove         = __devexit_p(radeonfb_pci_unregister),
 };
 
-int __init radeonfb_old_setup (char *options);
-
-int __init radeonfb_old_init (void)
-{
 #ifndef MODULE
-       char *option = NULL;
-
-       if (fb_get_options("radeonfb_old", &option))
-               return -ENODEV;
-       radeonfb_old_setup(option);
-#endif
-       return pci_module_init (&radeonfb_driver);
-}
-
-
-void __exit radeonfb_old_exit (void)
-{
-       pci_unregister_driver (&radeonfb_driver);
-}
-
-
-int __init radeonfb_old_setup (char *options)
+static int __init radeonfb_old_setup (char *options)
 {
         char *this_opt;
 
@@ -3156,12 +3139,28 @@ int __init radeonfb_old_setup (char *options)
 
        return 0;
 }
+#endif  /*  MODULE  */
 
-module_init(radeonfb_old_init);
+static int __init radeonfb_old_init (void)
+{
+#ifndef MODULE
+       char *option = NULL;
 
-#ifdef MODULE
-module_exit(radeonfb_old_exit);
+       if (fb_get_options("radeonfb_old", &option))
+               return -ENODEV;
+       radeonfb_old_setup(option);
 #endif
+       return pci_register_driver (&radeonfb_driver);
+}
+
+
+static void __exit radeonfb_old_exit (void)
+{
+       pci_unregister_driver (&radeonfb_driver);
+}
+
+module_init(radeonfb_old_init);
+module_exit(radeonfb_old_exit);
 
 
 MODULE_AUTHOR("Ani Joshi");