diff --git a/[refs] b/[refs]
index 4a96340b7f05..33d54757ec98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e382f62be8a92ebbdf697ebfab260b7d943a359f
+refs/heads/master: 10329b962be782fa4fbebea9358063a4507d0c4d
diff --git a/trunk/drivers/media/video/video-buf.c b/trunk/drivers/media/video/video-buf.c
index f429f49901b9..635d102c86f0 100644
--- a/trunk/drivers/media/video/video-buf.c
+++ b/trunk/drivers/media/video/video-buf.c
@@ -1229,7 +1229,7 @@ videobuf_vm_nopage(struct vm_area_struct *vma, unsigned long vaddr,
 		vaddr,vma->vm_start,vma->vm_end);
 	if (vaddr > vma->vm_end)
 		return NOPAGE_SIGBUS;
-	page = alloc_page(GFP_USER);
+	page = alloc_page(GFP_USER | __GFP_DMA32);
 	if (!page)
 		return NOPAGE_OOM;
 	clear_user_page(page_address(page), vaddr, page);