diff options
| author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-09-29 15:09:07 +0000 |
|---|---|---|
| committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-09-29 15:09:07 +0000 |
| commit | d328e72247112f169b19b8bf8c7bf3d0ff1cc546 (patch) | |
| tree | 712ec088a4771e972b893ae84c619398cddd7bae /target/linux | |
| parent | ad41b53a74a30551454db9f7941ea90f5c4506be (diff) | |
| download | upstream-d328e72247112f169b19b8bf8c7bf3d0ff1cc546.tar.gz upstream-d328e72247112f169b19b8bf8c7bf3d0ff1cc546.tar.bz2 upstream-d328e72247112f169b19b8bf8c7bf3d0ff1cc546.zip | |
linux/ixp4xx: fix an embracing mistake on commit r23150 (thank you KanjiMonster)
SVN-Revision: 23153
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.36/050-disable_dmabounce.patch | 12 |
1 files changed, 9 insertions, 3 deletions
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) |