diff options
| author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-01 07:56:55 +0000 |
|---|---|---|
| committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-01 07:56:55 +0000 |
| commit | f21c103e5a69f7e6c18fc33fc6da1940f2307c60 (patch) | |
| tree | af668f3ffd4777fd9823251436d2a82e2240e1a0 /target/linux/lantiq/patches-3.2/0028-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch | |
| parent | 1efef1fe09658b5ec0aff95075b72f542416bf7e (diff) | |
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic).
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31158 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0028-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.2/0028-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.2/0028-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch b/target/linux/lantiq/patches-3.2/0028-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch index 6458af5cc..93215768b 100644 --- a/target/linux/lantiq/patches-3.2/0028-MIPS-lantiq-convert-dma-driver-to-clkdev-api.patch +++ b/target/linux/lantiq/patches-3.2/0028-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 60cd11f..388f1aa 100644 --- a/arch/mips/lantiq/xway/dma.c +++ b/arch/mips/lantiq/xway/dma.c @@ -20,6 +20,7 @@ @@ -60,6 +55,3 @@ index 60cd11f..388f1aa 100644 ltq_dma_w32_mask(0, DMA_RESET, LTQ_DMA_CTRL); /* disable all interrupts */ --- -1.7.7.1 - |