diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-07-26 07:19:58 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2013-07-26 07:19:58 +0000 |
commit | e9688455f60944b73ed69d435569c62b2670ac08 (patch) | |
tree | 7cfb04a54015dd34cab0306bfa2a450f42f815f1 /target/linux/xburst/patches-3.10/013-MIPS-JZ4740-Acquire-and-enable-DMA-controller-clock.patch | |
parent | aa81b9ed5ff5f016bc6fcefd110ee524d9dc98fd (diff) | |
download | upstream-e9688455f60944b73ed69d435569c62b2670ac08.tar.gz upstream-e9688455f60944b73ed69d435569c62b2670ac08.tar.bz2 upstream-e9688455f60944b73ed69d435569c62b2670ac08.zip |
kernel: update 3.10 to 3.10.3
Also refresh 3.10 patches.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37546
Diffstat (limited to 'target/linux/xburst/patches-3.10/013-MIPS-JZ4740-Acquire-and-enable-DMA-controller-clock.patch')
-rw-r--r-- | target/linux/xburst/patches-3.10/013-MIPS-JZ4740-Acquire-and-enable-DMA-controller-clock.patch | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/target/linux/xburst/patches-3.10/013-MIPS-JZ4740-Acquire-and-enable-DMA-controller-clock.patch b/target/linux/xburst/patches-3.10/013-MIPS-JZ4740-Acquire-and-enable-DMA-controller-clock.patch index 110f061568..027e3ad365 100644 --- a/target/linux/xburst/patches-3.10/013-MIPS-JZ4740-Acquire-and-enable-DMA-controller-clock.patch +++ b/target/linux/xburst/patches-3.10/013-MIPS-JZ4740-Acquire-and-enable-DMA-controller-clock.patch @@ -13,8 +13,6 @@ Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> arch/mips/jz4740/dma.c | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) -diff --git a/arch/mips/jz4740/clock.c b/arch/mips/jz4740/clock.c -index 1b5f554..b3eba60 100644 --- a/arch/mips/jz4740/clock.c +++ b/arch/mips/jz4740/clock.c @@ -921,4 +921,4 @@ static int jz4740_clock_init(void) @@ -23,8 +21,6 @@ index 1b5f554..b3eba60 100644 } -arch_initcall(jz4740_clock_init); +postcore_initcall(jz4740_clock_init); -diff --git a/arch/mips/jz4740/dma.c b/arch/mips/jz4740/dma.c -index 317ec6f..fb5266c 100644 --- a/arch/mips/jz4740/dma.c +++ b/arch/mips/jz4740/dma.c @@ -16,6 +16,7 @@ @@ -35,7 +31,7 @@ index 317ec6f..fb5266c 100644 #include <linux/interrupt.h> #include <linux/dma-mapping.h> -@@ -268,6 +269,7 @@ static irqreturn_t jz4740_dma_irq(int irq, void *dev_id) +@@ -268,6 +269,7 @@ static irqreturn_t jz4740_dma_irq(int ir static int jz4740_dma_init(void) { @@ -75,6 +71,3 @@ index 317ec6f..fb5266c 100644 return ret; } arch_initcall(jz4740_dma_init); --- -1.7.10.4 - |