---

yaml --- r: 253434 b: refs/heads/master c: 1f758a4 h: refs/heads/master v: v3
git-mirror · Jun 11, 2011 · dc73e4e · dc73e4e
1 parent 94f360b
commit dc73e4e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;