aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.2/202-owrt-atm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/lantiq/patches-3.2/202-owrt-atm.patch')
-rw-r--r--target/linux/lantiq/patches-3.2/202-owrt-atm.patch32
1 files changed, 12 insertions, 20 deletions
diff --git a/target/linux/lantiq/patches-3.2/202-owrt-atm.patch b/target/linux/lantiq/patches-3.2/202-owrt-atm.patch
index 5f7be88aab..a9ded7a903 100644
--- a/target/linux/lantiq/patches-3.2/202-owrt-atm.patch
+++ b/target/linux/lantiq/patches-3.2/202-owrt-atm.patch
@@ -1,7 +1,5 @@
-Index: linux-3.2.9/arch/mips/lantiq/irq.c
-===================================================================
---- linux-3.2.9.orig/arch/mips/lantiq/irq.c 2012-03-08 17:17:13.937473031 +0100
-+++ linux-3.2.9/arch/mips/lantiq/irq.c 2012-03-08 17:32:57.389513360 +0100
+--- a/arch/mips/lantiq/irq.c
++++ b/arch/mips/lantiq/irq.c
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/ioport.h>
@@ -10,7 +8,7 @@ Index: linux-3.2.9/arch/mips/lantiq/irq.c
#include <asm/bootinfo.h>
#include <asm/irq_cpu.h>
-@@ -111,6 +112,7 @@
+@@ -111,6 +112,7 @@ void ltq_mask_and_ack_irq(struct irq_dat
ltq_icu_w32(ltq_icu_r32(ier) & ~(1 << irq_nr), ier);
ltq_icu_w32((1 << irq_nr), isr);
}
@@ -18,11 +16,9 @@ Index: linux-3.2.9/arch/mips/lantiq/irq.c
static void ltq_ack_irq(struct irq_data *d)
{
-Index: linux-3.2.9/arch/mips/mm/cache.c
-===================================================================
---- linux-3.2.9.orig/arch/mips/mm/cache.c 2012-03-01 01:32:49.000000000 +0100
-+++ linux-3.2.9/arch/mips/mm/cache.c 2012-03-08 17:17:14.193473042 +0100
-@@ -57,6 +57,8 @@
+--- a/arch/mips/mm/cache.c
++++ b/arch/mips/mm/cache.c
+@@ -57,6 +57,8 @@ void (*_dma_cache_wback)(unsigned long s
void (*_dma_cache_inv)(unsigned long start, unsigned long size);
EXPORT_SYMBOL(_dma_cache_wback_inv);
@@ -31,11 +27,9 @@ Index: linux-3.2.9/arch/mips/mm/cache.c
#endif /* CONFIG_DMA_NONCOHERENT */
-Index: linux-3.2.9/net/atm/proc.c
-===================================================================
---- linux-3.2.9.orig/net/atm/proc.c 2012-03-01 01:32:49.000000000 +0100
-+++ linux-3.2.9/net/atm/proc.c 2012-03-08 17:17:14.193473042 +0100
-@@ -154,7 +154,7 @@
+--- a/net/atm/proc.c
++++ b/net/atm/proc.c
+@@ -154,7 +154,7 @@ static void *vcc_seq_next(struct seq_fil
static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc)
{
static const char *const class_name[] = {
@@ -44,11 +38,9 @@ Index: linux-3.2.9/net/atm/proc.c
static const char *const aal_name[] = {
"---", "1", "2", "3/4", /* 0- 3 */
"???", "5", "???", "???", /* 4- 7 */
-Index: linux-3.2.9/net/atm/common.c
-===================================================================
---- linux-3.2.9.orig/net/atm/common.c 2012-03-01 01:32:49.000000000 +0100
-+++ linux-3.2.9/net/atm/common.c 2012-03-08 17:17:14.193473042 +0100
-@@ -62,11 +62,17 @@
+--- a/net/atm/common.c
++++ b/net/atm/common.c
+@@ -62,11 +62,17 @@ static void vcc_remove_socket(struct soc
write_unlock_irq(&vcc_sklist_lock);
}