From a347d7390f207e16a067a98fee147861f44482ba Mon Sep 17 00:00:00 2001
From: Amber Jain <amber@ti.com>
Date: Tue, 31 May 2011 11:45:35 -0300
Subject: [PATCH] --- yaml --- r: 261580 b: refs/heads/master c:
 e831599cb8bed4e6aa2a336ec2e3aaf74dee6353 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/video/omap/omap_vout.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 07b09f7df8b3..92d69a7ea1a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 949d9264589b759df66d40d497d14ecc49681b3a
+refs/heads/master: e831599cb8bed4e6aa2a336ec2e3aaf74dee6353
diff --git a/trunk/drivers/media/video/omap/omap_vout.c b/trunk/drivers/media/video/omap/omap_vout.c
index a647894d3a71..cb70ff139d8f 100644
--- a/trunk/drivers/media/video/omap/omap_vout.c
+++ b/trunk/drivers/media/video/omap/omap_vout.c
@@ -181,7 +181,7 @@ static unsigned long omap_vout_alloc_buffer(u32 buf_size, u32 *phys_addr)
 
 	size = PAGE_ALIGN(buf_size);
 	order = get_order(size);
-	virt_addr = __get_free_pages(GFP_KERNEL | GFP_DMA, order);
+	virt_addr = __get_free_pages(GFP_KERNEL, order);
 	addr = virt_addr;
 
 	if (virt_addr) {