summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/em28xx
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2007-02-19 19:57:36 -0800
committerTrent Piepho <xyzzy@speakeasy.org>2007-02-19 19:57:36 -0800
commit98901e271eeb3ffc496d67ebe1f30c744d7e63cd (patch)
tree4816d0977734c49761a4f21493d6d7a5b322b46c /linux/drivers/media/video/em28xx
parentdf6112a72da3840ed73c44ba5bdc8f69228d4393 (diff)
downloadmediapointer-dvb-s2-98901e271eeb3ffc496d67ebe1f30c744d7e63cd.tar.gz
mediapointer-dvb-s2-98901e271eeb3ffc496d67ebe1f30c744d7e63cd.tar.bz2
compat: Add compat code for vm_insert_page()
From: Trent Piepho <xyzzy@speakeasy.org> Add an inline versin of vm_insert_page() that uses remap_pfn_range() to compat.h. Remove compat code from em28xx-video.c, sn9c102_core.c, and usbvision-video.c since compat.h is now doing the same thing. USB_ZC0301, USB_ET61X251, and USB_ZR364XX will now compile under 2.6.12. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Diffstat (limited to 'linux/drivers/media/video/em28xx')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-video.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c
index f03547db8..3abd11d2b 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -660,15 +660,8 @@ static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
pos = dev->frame[i].bufmem;
while (size > 0) { /* size is page-aligned */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
- unsigned long page = vmalloc_to_pfn(pos);
- if (remap_pfn_range(vma, start, page, PAGE_SIZE,
- vma->vm_page_prot)) {
- em28xx_videodbg("mmap: rename page map failed\n");
-#else
if (vm_insert_page(vma, start, vmalloc_to_page(pos))) {
em28xx_videodbg("mmap: vm_insert_page failed\n");
-#endif
mutex_unlock(&dev->fileop_lock);
return -EAGAIN;
}