diff --git a/[refs] b/[refs]
index 71d999529431..54f9381996c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad1ecf8639e51ab8066cd4f37fd36b6b7cbdd8b3
+refs/heads/master: 41d9931c5ae014fbab8bf612c70b8e7ff16f4641
diff --git a/trunk/drivers/media/video/videobuf-dma-sg.c b/trunk/drivers/media/video/videobuf-dma-sg.c
index 9d520601c70f..ddb8f4b46c03 100644
--- a/trunk/drivers/media/video/videobuf-dma-sg.c
+++ b/trunk/drivers/media/video/videobuf-dma-sg.c
@@ -543,14 +543,6 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
 
 	retval = -EINVAL;
 
-	/* This function maintains backwards compatibility with V4L1 and will
-	 * map more than one buffer if the vma length is equal to the combined
-	 * size of multiple buffers than it will map them together.  See
-	 * VIDIOCGMBUF in the v4l spec
-	 *
-	 * TODO: Allow drivers to specify if they support this mode
-	 */
-
 	BUG_ON(!mem);
 	MAGIC_CHECK(mem->magic, MAGIC_SG_MEM);