patch-2.2.0-pre9 linux/drivers/video/clgenfb.c

• Lines: 36
• Date: Tue Jan 19 10:47:48 1999
• Orig file: v2.2.0-pre8/linux/drivers/video/clgenfb.c
• Orig date: Thu Nov 19 09:56:28 1998

diff -u --recursive --new-file v2.2.0-pre8/linux/drivers/video/clgenfb.c linux/drivers/video/clgenfb.c
@@ -16,6 +16,7 @@
 #include <asm/amigahw.h>
 #include <asm/pgtable.h>
 #include <asm/delay.h>
+#include <asm/io.h>
 
 #include <video/fbcon.h>
 #include <video/fbcon-mfb.h>
@@ -1533,15 +1534,13 @@
         /* begin of the board, but the begin of RAM. */
 	/* for P4, map in its address space in 2 chunks (### TEST! ) */
 	/* (note the ugly hardcoded 16M number) */
-	fb_info->regs = (unsigned char *)kernel_map(board_addr, 16777216, 
-	                                      KERNELMAP_NOCACHE_SER, NULL);
+	fb_info->regs = ioremap(board_addr, 16777216);
         DEBUG printk(KERN_INFO "clgen: Virtual address for board set to: $%p\n", fb_info->regs);
 	fb_info->regs += 0x600000;
 	fb_info->fbregs_phys = board_addr + 0x600000;
 
 	fb_info->fbmem_phys = board_addr + 16777216;
-	fb_info->fbmem = kernel_map(fb_info->fbmem_phys, 16777216, 
-			      KERNELMAP_NOCACHE_SER, NULL);
+	fb_info->fbmem = ioremap(fb_info->fbmem_phys, 16777216);
 	DEBUG printk(KERN_INFO "clgen: (RAM start set to: $%lx)\n", fb_info->fbmem);
     }
     else
@@ -1551,8 +1550,7 @@
 
 	fb_info->fbmem_phys = board_addr;
         if (board_addr > 0x01000000)
-	    fb_info->fbmem = kernel_map(board_addr, board_size, 
-				  KERNELMAP_NOCACHE_SER, NULL);
+	    fb_info->fbmem = ioremap(board_addr, board_size);
 	else
 	    fb_info->fbmem = ZTWO_VADDR(board_addr);