2002-03-08 11:07:15

by bert hubert

[permalink] [raw]
Subject: new sisfb driver 2.5.6 compile fix

Thomas,

This patch makes your most recent work (as found on
http://www.webit.at/~twinny/linuxsis630.shtml) compile & work on 2.5.6.

Regards,

bert


diff -urBb sis-orig/sis_main.c sis/sis_main.c
--- sis-orig/sis_main.c Wed Mar 6 19:47:21 2002
+++ sis/sis_main.c Fri Mar 8 11:09:58 2002
@@ -2286,7 +2286,7 @@
if (boot_cpu_data.x86 > 3)
pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
#endif
- if (io_remap_page_range(vma->vm_start, off, vma->vm_end - vma->vm_start,
+ if (io_remap_page_range(vma, vma->vm_start, off, vma->vm_end - vma->vm_start,
vma->vm_page_prot))
return -EAGAIN;
return 0;
@@ -2994,7 +2994,7 @@
sisfb_crtc_to_var(&default_var);

fb_info.changevar = NULL;
- fb_info.node = -1;
+ fb_info.node = NODEV;
fb_info.fbops = &sisfb_ops;
fb_info.disp = &disp;
fb_info.switch_con = &sisfb_switch;

--
http://www.PowerDNS.com Versatile DNS Software & Services
http://www.tk the dot in .tk
http://lartc.org Linux Advanced Routing & Traffic Control HOWTO