patch-2.4.20 linux-2.4.20/drivers/video/tridentfb.c
Next file: linux-2.4.20/drivers/video/tx3912fb.c
Previous file: linux-2.4.20/drivers/video/stifb.c
Back to the patch index
Back to the overall index
- Lines: 34
- Date:
Thu Nov 28 15:53:15 2002
- Orig file:
linux-2.4.19/drivers/video/tridentfb.c
- Orig date:
Fri Aug 2 17:39:45 2002
diff -urN linux-2.4.19/drivers/video/tridentfb.c linux-2.4.20/drivers/video/tridentfb.c
@@ -56,11 +56,11 @@
struct tridentfb_info {
struct fb_info_gen gen;
- unsigned int fbmem_virt; //framebuffer virtual memory address
- unsigned int fbmem; //framebuffer physical memory address
+ unsigned long fbmem_virt; //framebuffer virtual memory address
+ unsigned long fbmem; //framebuffer physical memory address
unsigned int memsize; //size of fbmem
- unsigned int io; //io space address
- unsigned int io_virt; //iospace virtual memory address
+ unsigned long io; //io space address
+ unsigned long io_virt; //iospace virtual memory address
unsigned int nativex; //flat panel xres
struct tridentfb_par currentmode;
unsigned char eng_oper; //engine operation...
@@ -1321,7 +1321,7 @@
return -1;
}
- fb_info.io_virt = (unsigned int)ioremap_nocache(fb_info.io, trident_iosize);
+ fb_info.io_virt = (unsigned long)ioremap_nocache(fb_info.io, trident_iosize);
if (!fb_info.io_virt) {
release_region(fb_info.io, trident_iosize);
@@ -1337,7 +1337,7 @@
return -1;
}
- fb_info.fbmem_virt = (unsigned int)ioremap_nocache(fb_info.fbmem, fb_info.memsize);
+ fb_info.fbmem_virt = (unsigned long)ioremap_nocache(fb_info.fbmem, fb_info.memsize);
if (!fb_info.fbmem_virt) {
release_mem_region(fb_info.fbmem, fb_info.memsize);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)