From dc73e4e972c475bfdcee62b4ceff016e0c0ea861 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@iki.fi>
Date: Sat, 11 Jun 2011 08:39:57 +0000
Subject: [PATCH] --- yaml --- r: 253434 b: refs/heads/master c:
 1f758a4341ac83289a549e6ba2d29a08cf639717 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/arm/ep93xx_eth.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ab0760905496..97484e91875f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3247a1fcee49b571b40c4bd723439ce5c64f56ad
+refs/heads/master: 1f758a4341ac83289a549e6ba2d29a08cf639717
diff --git a/trunk/drivers/net/arm/ep93xx_eth.c b/trunk/drivers/net/arm/ep93xx_eth.c
index 97bf6b10ce61..bef38116abaf 100644
--- a/trunk/drivers/net/arm/ep93xx_eth.c
+++ b/trunk/drivers/net/arm/ep93xx_eth.c
@@ -492,7 +492,7 @@ static int ep93xx_alloc_buffers(struct ep93xx_priv *ep)
 	int i;
 
 	ep->descs = dma_alloc_coherent(dev, sizeof(struct ep93xx_descs),
-				&ep->descs_dma_addr, GFP_KERNEL | GFP_DMA);
+				&ep->descs_dma_addr, GFP_KERNEL);
 	if (ep->descs == NULL)
 		return 1;