[parisc-linux-cvs] 2.4.18-pa55: fix initialisation order for stifb/sticon

[Helge Deller]

--Boundary-00=_nFJM9VJz4v4muFD
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline

On Saturday 13 July 2002 22:39, Helge Deller wrote:
> CVSROOT:	/var/cvs
> Module name:	linux
> Changes by:	deller	02/07/13 14:39:32
>
> Modified files:
> 	.              : Makefile
> 	drivers/video/sti: sticon.c stifb.c
>
> Log message:
> 2.4.18-pa55:
> - fix the initialisation order for stifb/sticon,
> (this fixes stifb's warning about non-allocatable memory regions)


--Boundary-00=_nFJM9VJz4v4muFD
Content-Type: text/plain;
  charset="iso-8859-1";
  name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="diff"

Index: Makefile
===================================================================
RCS file: /var/cvs/linux/Makefile,v
retrieving revision 1.325
diff -u -p -r1.325 Makefile
--- Makefile	10 Jul 2002 06:35:31 -0000	1.325
+++ Makefile	13 Jul 2002 20:36:11 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 18
-EXTRAVERSION = -pa54
+EXTRAVERSION = -pa55
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
Index: drivers/video/sti/sticon.c
===================================================================
RCS file: /var/cvs/linux/drivers/video/sti/sticon.c,v
retrieving revision 1.20
diff -u -p -r1.20 sticon.c
--- drivers/video/sti/sticon.c	24 Aug 2001 14:45:06 -0000	1.20
+++ drivers/video/sti/sticon.c	13 Jul 2002 20:36:11 -0000
@@ -391,10 +391,11 @@ struct consw sti_con = {
 
 int __init sticonsole_init(void)
 {
-    printk(KERN_INFO "%s: searching for STI ROMs\n", __FUNCTION__);
     if (sti_init_roms()) {
-	if (conswitchp == &dummy_con)
+	if (conswitchp == &dummy_con) {
+        	printk(KERN_INFO "sticon: Initializing STI text console.\n");
 		take_over_console(&sti_con, 0, MAX_NR_CONSOLES - 1, 1);
+	}
 	return 0;
     } else
 	return -ENODEV;
Index: drivers/video/sti/stifb.c
===================================================================
RCS file: /var/cvs/linux/drivers/video/sti/stifb.c,v
retrieving revision 1.33
diff -u -p -r1.33 stifb.c
--- drivers/video/sti/stifb.c	17 Jun 2002 22:53:41 -0000	1.33
+++ drivers/video/sti/stifb.c	13 Jul 2002 20:36:12 -0000
@@ -1461,22 +1461,16 @@ stifb_init(void)
 	return 0;
 }
 
-module_init(stifb_init);
-
-
 /*
  *  Cleanup
-*/
+ */
 
-void
+void __exit
 stifb_cleanup(struct fb_info *info)
 {
 	// unregister_framebuffer(info); 
 }
 
-module_exit(stifb_cleanup);
-
-
 int __init
 stifb_setup(char *options)
 {
@@ -1498,6 +1492,11 @@ stifb_setup(char *options)
 }
 
 __setup("stifb=", stifb_setup);
+
+#ifdef MODULE
+module_init(stifb_init);
+#endif
+module_exit(stifb_cleanup);
 
 MODULE_AUTHOR("Helge Deller <deller@gmx.de>, Thomas Bogendoerfer <tsbogend@alpha.franken.de>");
 MODULE_DESCRIPTION("Framebuffer driver for HP's NGLE series graphics cards in HP PARISC machines");

--Boundary-00=_nFJM9VJz4v4muFD--