# HG changeset patch
# User alex
# Date 1025282137 0
# Node ID df10f81f1bfc6e986c504dcef59a35bb1e1358d5
# Parent  eb10ce6b3f188628e690cea0fa567e5b67e0a86e
linux-2.5.x support patch by Sytse Wielinga <s.b.wieling at student.utwente.nl>

diff -r eb10ce6b3f18 -r df10f81f1bfc drivers/mga_vid.c
--- a/drivers/mga_vid.c	Fri Jun 28 16:33:46 2002 +0000
+++ b/drivers/mga_vid.c	Fri Jun 28 16:35:37 2002 +0000
@@ -133,7 +133,9 @@
                 *endp = (char *)cp;
         return result;
 }
+#endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,5)
 static long simple_strtol(const char *cp,char **endp,unsigned int base)
 {
         if(*cp=='-')
@@ -1472,8 +1474,13 @@
 #ifdef MP_DEBUG
 	printk(KERN_DEBUG "mga_vid: mapping video memory into userspace\n");
 #endif	
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,3)
+	if(remap_page_range(vma, vma->vm_start, mga_mem_base + mga_src_base,
+		 vma->vm_end - vma->vm_start, vma->vm_page_prot)) 
+#else
 	if(remap_page_range(vma->vm_start, mga_mem_base + mga_src_base,
 		 vma->vm_end - vma->vm_start, vma->vm_page_prot)) 
+#endif
 	{
 		printk(KERN_ERR "mga_vid: error mapping video memory\n");
 		return(-EAGAIN);
@@ -1507,7 +1514,11 @@
 
 static int mga_vid_open(struct inode *inode, struct file *file)
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,2)
+	int minor = MINOR(inode->i_rdev.value);
+#else
 	int minor = MINOR(inode->i_rdev);
+#endif
 
 	if(minor != 0)
 	 return(-ENXIO);