patch-2.3.99-pre6 linux/drivers/video/tdfxfb.c

• Lines: 46
• Date: Fri Apr 14 09:37:10 2000
• Orig file: v2.3.99-pre5/linux/drivers/video/tdfxfb.c
• Orig date: Thu Jan 6 12:57:48 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/drivers/video/tdfxfb.c linux/drivers/video/tdfxfb.c
@@ -583,7 +583,9 @@
 static int  nopan   = 0;
 static int  nowrap  = 1;      // not implemented (yet)
 static int  inverse = 0;
+#ifdef CONFIG_MTRR
 static int  nomtrr = 0;
+#endif
 static int  nohwcursor = 0;
 static char __initdata fontname[40] = { 0 };
 static const char *mode_option __initdata = NULL;
@@ -1987,7 +1989,7 @@
       fb_info.regbase_phys = pdev->base_address[0] & PCI_BASE_ADDRESS_MEM_MASK;
       fb_info.regbase_size = 1 << 24;
       fb_info.regbase_virt = 
-	(u32)ioremap_nocache(fb_info.regbase_phys, 1 << 24);
+	(unsigned long)ioremap_nocache(fb_info.regbase_phys, 1 << 24);
       if(!fb_info.regbase_virt) {
 	printk("fb: Can't remap %s register area.\n", name);
 	return;
@@ -2000,7 +2002,7 @@
 	return;
       }
       fb_info.bufbase_virt    = 
-	(u32)ioremap_nocache(fb_info.bufbase_phys, fb_info.bufbase_size);
+	(unsigned long)ioremap_nocache(fb_info.bufbase_phys, fb_info.bufbase_size);
       if(!fb_info.regbase_virt) {
 	printk("fb: Can't remap %s framebuffer.\n", name);
 	iounmap((void*)fb_info.regbase_virt);
@@ -2012,7 +2014,7 @@
       fb_info.regbase_phys = pdev->resource[0].start;
       fb_info.regbase_size = 1 << 24;
       fb_info.regbase_virt = 
-	(u32)ioremap_nocache(fb_info.regbase_phys, 1 << 24);
+	(unsigned long)ioremap_nocache(fb_info.regbase_phys, 1 << 24);
       if(!fb_info.regbase_virt) {
 	printk("fb: Can't remap %s register area.\n", name);
 	return -ENXIO;
@@ -2025,7 +2027,7 @@
 	return -ENXIO;
       }
       fb_info.bufbase_virt    = 
-	(u32)ioremap_nocache(fb_info.bufbase_phys, fb_info.bufbase_size);
+	(unsigned long)ioremap_nocache(fb_info.bufbase_phys, fb_info.bufbase_size);
       if(!fb_info.regbase_virt) {
 	printk("fb: Can't remap %s framebuffer.\n", name);
 	iounmap((void*)fb_info.regbase_virt);