diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /drivers/media/video/videobuf-vmalloc.c | |
parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'drivers/media/video/videobuf-vmalloc.c')
-rw-r--r-- | drivers/media/video/videobuf-vmalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c index a868b7ed75ff..be65a2fb3976 100644 --- a/drivers/media/video/videobuf-vmalloc.c +++ b/drivers/media/video/videobuf-vmalloc.c | |||
@@ -203,7 +203,7 @@ static int __videobuf_iolock (struct videobuf_queue* q, | |||
203 | return 0; | 203 | return 0; |
204 | 204 | ||
205 | /* FIXME: to properly support USERPTR, remap should occur. | 205 | /* FIXME: to properly support USERPTR, remap should occur. |
206 | The code bellow won't work, since mem->vma = NULL | 206 | The code below won't work, since mem->vma = NULL |
207 | */ | 207 | */ |
208 | /* Try to remap memory */ | 208 | /* Try to remap memory */ |
209 | rc = remap_vmalloc_range(mem->vma, (void *)vb->baddr, 0); | 209 | rc = remap_vmalloc_range(mem->vma, (void *)vb->baddr, 0); |