diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-06-28 16:35:37 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-06-28 16:35:37 +0000 |
| commit | d1d354e009030c2d632ca829e7c148287f3708d5 (patch) | |
| tree | a505c3a8d0ada62749f0a55b3e73f83f5e02c475 /drivers | |
| parent | 05258251d268d29de801268cf61d90090c6165bd (diff) | |
| download | mpv-d1d354e009030c2d632ca829e7c148287f3708d5.tar.bz2 mpv-d1d354e009030c2d632ca829e7c148287f3708d5.tar.xz | |
linux-2.5.x support patch by Sytse Wielinga <s.b.wieling at student.utwente.nl>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6587 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mga_vid.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/mga_vid.c b/drivers/mga_vid.c index dd19442526..68a39ac877 100644 --- a/drivers/mga_vid.c +++ b/drivers/mga_vid.c @@ -133,7 +133,9 @@ static unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base *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 @@ static int mga_vid_mmap(struct file *file, struct vm_area_struct *vma) #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 long long mga_vid_lseek(struct file *file, long long offset, int origin) 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); |