diff --git a/[refs] b/[refs]
index 92d69a7ea1a0..746dcd0a2efe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e831599cb8bed4e6aa2a336ec2e3aaf74dee6353
+refs/heads/master: e213e438ce2a7451572f1c00ed87893ca25d3ea9
diff --git a/trunk/drivers/media/video/omap24xxcam.c b/trunk/drivers/media/video/omap24xxcam.c
index ba3a8af76a8c..2a598576357f 100644
--- a/trunk/drivers/media/video/omap24xxcam.c
+++ b/trunk/drivers/media/video/omap24xxcam.c
@@ -308,11 +308,11 @@ static int omap24xxcam_vbq_alloc_mmap_buffer(struct videobuf_buffer *vb)
 			order--;
 
 		/* try to allocate as many contiguous pages as possible */
-		page = alloc_pages(GFP_KERNEL | GFP_DMA, order);
+		page = alloc_pages(GFP_KERNEL, order);
 		/* if allocation fails, try to allocate smaller amount */
 		while (page == NULL) {
 			order--;
-			page = alloc_pages(GFP_KERNEL | GFP_DMA, order);
+			page = alloc_pages(GFP_KERNEL, order);
 			if (page == NULL && !order) {
 				err = -ENOMEM;
 				goto out;