Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

[linux-2.6-omap-h63xx.git] / drivers / media / video / videobuf-vmalloc.c

diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
index c91e1d8e38025d32c292d888cac3feeb20103d6d..be65a2fb39762551d8d30c56634cf273aa909636 100644 (file)
--- a/drivers/media/video/videobuf-vmalloc.c
+++ b/drivers/media/video/videobuf-vmalloc.c
@@ -1,7 +1,7 @@
 /*
  * helper functions for vmalloc video4linux capture buffers
  *
- * The functions expect the hardware being able to scatter gatter
+ * The functions expect the hardware being able to scatter gather
  * (i.e. the buffers are not linear in physical memory, but fragmented
  * into PAGE_SIZE chunks).  They also assume the driver does not need
  * to touch the video data.
@@ -203,7 +203,7 @@ static int __videobuf_iolock (struct videobuf_queue* q,
                        return 0;
 
                /* FIXME: to properly support USERPTR, remap should occur.
-                  The code bellow won't work, since mem->vma = NULL
+                  The code below won't work, since mem->vma = NULL
                 */
                /* Try to remap memory */
                rc = remap_vmalloc_range(mem->vma, (void *)vb->baddr, 0);