diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:48:29 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:48:29 -0200 |
| commit | 6cefcaedffe3456acaf4d72d63c07c8b3a9a8d8b (patch) | |
| tree | 7e1fac27df4358a4ffb22c41d5039ef35260239e /linux/drivers/media/video/em28xx | |
| parent | 3163e57be54a44818c4bdaafa54f1f5a23dd5f4f (diff) | |
| parent | a47be5953c72392a7be1efafc70621242275f08f (diff) | |
| download | mediapointer-dvb-s2-6cefcaedffe3456acaf4d72d63c07c8b3a9a8d8b.tar.gz mediapointer-dvb-s2-6cefcaedffe3456acaf4d72d63c07c8b3a9a8d8b.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/em28xx')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-video.c | 7 |
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; } |