diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2014-01-11 16:06:37 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2014-01-11 16:06:37 +0000 |
commit | 0e2586a7748385c97062a8d8816c98011175fb3d (patch) | |
tree | 819954dd504b84d34aba5e827e06e5b319ddc393 /target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch | |
parent | 30ebad2dee1bc348c9b8234f0649a0b8f7a9cb40 (diff) | |
download | master-31e0f0ae-0e2586a7748385c97062a8d8816c98011175fb3d.tar.gz master-31e0f0ae-0e2586a7748385c97062a8d8816c98011175fb3d.tar.bz2 master-31e0f0ae-0e2586a7748385c97062a8d8816c98011175fb3d.zip |
kernel: update 3.10 to 3.10.26
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39220
Diffstat (limited to 'target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch')
-rw-r--r-- | target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch b/target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch index 1d53a8d672..b3b42d409d 100644 --- a/target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch +++ b/target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch @@ -157,7 +157,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> return 0; --- a/arch/mips/mm/dma-default.c +++ b/arch/mips/mm/dma-default.c -@@ -289,7 +289,6 @@ static void mips_dma_sync_single_for_cpu +@@ -293,7 +293,6 @@ static void mips_dma_sync_single_for_cpu static void mips_dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size, enum dma_data_direction direction) { @@ -165,7 +165,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (!plat_device_is_coherent(dev)) __dma_sync(dma_addr_to_page(dev, dma_handle), dma_handle & ~PAGE_MASK, size, direction); -@@ -323,7 +322,7 @@ static void mips_dma_sync_sg_for_device( +@@ -327,7 +326,7 @@ static void mips_dma_sync_sg_for_device( int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { @@ -174,7 +174,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> } int mips_dma_supported(struct device *dev, u64 mask) -@@ -336,7 +335,6 @@ void dma_cache_sync(struct device *dev, +@@ -340,7 +339,6 @@ void dma_cache_sync(struct device *dev, { BUG_ON(direction == DMA_NONE); |