patch-2.3.13 linux/drivers/video/atafb.c

• Lines: 42
• Date: Mon Aug 9 11:39:38 1999
• Orig file: v2.3.12/linux/drivers/video/atafb.c
• Orig date: Thu Feb 25 10:02:11 1999

diff -u --recursive --new-file v2.3.12/linux/drivers/video/atafb.c linux/drivers/video/atafb.c
@@ -2745,7 +2745,7 @@
 		do_install_cmap(currcon, info);
 }
 
-__initfunc(void atafb_init(void))
+void __init atafb_init(void)
 {
 	int pad;
 	int detected_mode;
@@ -2828,9 +2828,12 @@
 		/* Map the video memory (physical address given) to somewhere
 		 * in the kernel address space.
 		 */
-		external_addr = ioremap_writethrough(external_addr, external_len);
+		external_addr =
+		  ioremap_writethrough((unsigned long)external_addr,
+				       external_len);
 		if (external_vgaiobase)
-			external_vgaiobase = ioremap(external_vgaiobase, 0x10000 );
+			external_vgaiobase =
+			  (unsigned long)ioremap(external_vgaiobase, 0x10000);
 		screen_base      =
 		real_screen_base = external_addr;
 		screen_len       = external_len & PAGE_MASK;
@@ -2892,7 +2895,7 @@
   return sbegin;
 }
 
-__initfunc(void atafb_setup( char *options, int *ints ))
+void __init atafb_setup( char *options, int *ints )
 {
     char *this_opt;
     int temp;
@@ -3069,7 +3072,7 @@
 	external_yres  = yres;
 	external_depth = depth;
 	external_pmode = planes;
-	external_addr  = addr;
+	external_addr  = (void *)addr;
 	external_len   = len;
 		
 	if (external_card_type == IS_MV300)