aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-01 17:38:54 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-01 17:38:54 +0000
commitd1c0a65266b0bbfbe2839f3f5401e09ab9eb7664 (patch)
tree79b063a7c43e138a404575365ae614c85477ccd3 /target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch
parent70c3a60947cc0b000a4174e65206fe89cb43c7ae (diff)
downloadupstream-d1c0a65266b0bbfbe2839f3f5401e09ab9eb7664.tar.gz
upstream-d1c0a65266b0bbfbe2839f3f5401e09ab9eb7664.tar.bz2
upstream-d1c0a65266b0bbfbe2839f3f5401e09ab9eb7664.zip
kernel: update 3.18 to rc7
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43479
Diffstat (limited to 'target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch')
-rw-r--r--target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch b/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch
index c13e191cf7..7425ba0305 100644
--- a/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch
+++ b/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch
@@ -510,7 +510,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,
-@@ -167,8 +145,8 @@ void dma_free_noncoherent(struct device
+@@ -167,8 +145,8 @@ void dma_free_noncoherent(struct device
}
EXPORT_SYMBOL(dma_free_noncoherent);
@@ -650,7 +650,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction)
-@@ -360,23 +238,10 @@ void dma_cache_sync(struct device *dev,
+@@ -360,23 +238,10 @@ void dma_cache_sync(struct device *dev,
EXPORT_SYMBOL(dma_cache_sync);