From: Alexandros C. Couloumbis <alex@ozo.com>
Date: Wed, 29 Sep 2010 15:09:07 +0000 (+0000)
Subject: linux/ixp4xx: fix an embracing mistake on commit r23150 (thank you KanjiMonster)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d328e72247112f169b19b8bf8c7bf3d0ff1cc546;p=openwrt%2Fstaging%2Fzorun.git

linux/ixp4xx: fix an embracing mistake on commit r23150 (thank you KanjiMonster)

SVN-Revision: 23153
---

diff --git a/target/linux/ixp4xx/patches-2.6.36/050-disable_dmabounce.patch b/target/linux/ixp4xx/patches-2.6.36/050-disable_dmabounce.patch
index 33509baa2b..bdbec619e3 100644
--- a/target/linux/ixp4xx/patches-2.6.36/050-disable_dmabounce.patch
+++ b/target/linux/ixp4xx/patches-2.6.36/050-disable_dmabounce.patch
@@ -129,7 +129,7 @@
  #include <linux/scatterlist.h>
  
  #include <asm/cacheflush.h>
-@@ -248,8 +249,15 @@ static inline dma_addr_t map_single(stru
+@@ -248,7 +249,13 @@ static inline dma_addr_t map_single(stru
  		needs_bounce = (dma_addr | (dma_addr + size - 1)) & ~mask;
  	}
  
@@ -142,7 +142,13 @@
 +
 +	if (device_info && (needs_bounce || dma_needs_bounce_2(dev, dma_addr, size))) {
  		struct safe_buffer *buf;
-+#endif
  
  		buf = alloc_safe_buffer(device_info, ptr, size, dir);
- 		if (buf == 0) {
+@@ -282,6 +289,7 @@ static inline dma_addr_t map_single(stru
+ 
+ 	return dma_addr;
+ }
++#endif
+ 
+ static inline void unmap_single(struct device *dev, dma_addr_t dma_addr,
+ 		size_t size, enum dma_data_direction dir)