[MPlayer-cvslog] r22696 - trunk/drivers/mga_vid.c

[diego]

Author: diego
Date: Sat Mar 17 16:12:58 2007
New Revision: 22696

Modified:
   trunk/drivers/mga_vid.c

Log:
Remove support for 2.5.x kernels.
It's just a bunch of ugly #ifdef conditionals and probably does not work
with later 2.5.x versions anyway.  For 2.6.x there is an external version.


Modified: trunk/drivers/mga_vid.c
==============================================================================
--- trunk/drivers/mga_vid.c	(original)
+++ trunk/drivers/mga_vid.c	Sat Mar 17 16:12:58 2007
@@ -145,9 +145,7 @@ static unsigned long simple_strtoul(cons
                 *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=='-')
@@ -1461,13 +1459,8 @@ static int mga_vid_mmap(struct file *fil
 		return(-EAGAIN);
 	}
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,3)
-	if(remap_page_range(vma, vma->vm_start, card->mem_base + card->src_base,
-		 vma->vm_end - vma->vm_start, vma->vm_page_prot)) 
-#else
 	if(remap_page_range(vma->vm_start, card->mem_base + card->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,11 +1500,7 @@ static int mga_vid_open(struct inode *in
 {
 	mga_card_t * card;
 	
-#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(!file->private_data)
 	{