diff options
author | Jonas Gorski <jogo@openwrt.org> | 2012-04-17 12:51:02 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-17 12:51:02 +0000 |
commit | afbf3d994e57e06f8f5669033ab0e89af44e49c4 (patch) | |
tree | c94f0225aafe46c2716aa14d0f53941d81d40b8d /target/linux/lantiq/patches-3.3/0024-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch | |
parent | 23578461a92aca344eb5d34d59352da3163281a8 (diff) | |
download | upstream-afbf3d994e57e06f8f5669033ab0e89af44e49c4.tar.gz upstream-afbf3d994e57e06f8f5669033ab0e89af44e49c4.tar.bz2 upstream-afbf3d994e57e06f8f5669033ab0e89af44e49c4.zip |
kernel: update linux 3.3 to 3.3.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31336 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.3/0024-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.3/0024-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/target/linux/lantiq/patches-3.3/0024-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch b/target/linux/lantiq/patches-3.3/0024-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch index 356924f243..01ced689db 100644 --- a/target/linux/lantiq/patches-3.3/0024-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch +++ b/target/linux/lantiq/patches-3.3/0024-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch @@ -12,9 +12,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 2 files changed, 16 insertions(+), 1 deletions(-) create mode 100644 arch/mips/lantiq/xway/Makefile.rej -diff --git a/arch/mips/lantiq/xway/Makefile.rej b/arch/mips/lantiq/xway/Makefile.rej -new file mode 100644 -index 0000000..c0d5b52 --- /dev/null +++ b/arch/mips/lantiq/xway/Makefile.rej @@ -0,0 +1,11 @@ @@ -29,8 +26,6 @@ index 0000000..c0d5b52 + + obj-$(CONFIG_LANTIQ_MACH_EASY50712) += mach-easy50712.o + obj-$(CONFIG_LANTIQ_MACH_EASY50601) += mach-easy50601.o -diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c -index 6cf883b..ce86529 100644 --- a/arch/mips/lantiq/xway/dma.c +++ b/arch/mips/lantiq/xway/dma.c @@ -20,6 +20,7 @@ @@ -60,6 +55,3 @@ index 6cf883b..ce86529 100644 ltq_dma_w32_mask(0, DMA_RESET, LTQ_DMA_CTRL); /* disable all interrupts */ --- -1.7.9.1 - |