diff options
| author | John Crispin <john@openwrt.org> | 2011-09-26 09:35:02 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2011-09-26 09:35:02 +0000 |
| commit | cf59e7255dff4020c397f375fd62f15df955f5d2 (patch) | |
| tree | 2218e4171f371926b919a798d46ff949dcceac48 /target/linux/lantiq/patches-3.0/030-lmo-queue.patch | |
| parent | 07986230f1b5ff482a46242da6eefd1055521f7b (diff) | |
| download | upstream-cf59e7255dff4020c397f375fd62f15df955f5d2.tar.gz upstream-cf59e7255dff4020c397f375fd62f15df955f5d2.tar.bz2 upstream-cf59e7255dff4020c397f375fd62f15df955f5d2.zip | |
* rebase 3.0 patches * fold some fixes into existing patches
SVN-Revision: 28308
Diffstat (limited to 'target/linux/lantiq/patches-3.0/030-lmo-queue.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.0/030-lmo-queue.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/lantiq/patches-3.0/030-lmo-queue.patch b/target/linux/lantiq/patches-3.0/030-lmo-queue.patch index feaa237774..2cb1d08231 100644 --- a/target/linux/lantiq/patches-3.0/030-lmo-queue.patch +++ b/target/linux/lantiq/patches-3.0/030-lmo-queue.patch @@ -11,7 +11,7 @@ --- a/arch/mips/lantiq/clk.c +++ b/arch/mips/lantiq/clk.c -@@ -100,6 +100,17 @@ +@@ -100,6 +100,17 @@ void clk_put(struct clk *clk) } EXPORT_SYMBOL(clk_put); @@ -39,7 +39,7 @@ #include <asm/bootinfo.h> #include <asm/irq_cpu.h> -@@ -105,6 +106,7 @@ +@@ -99,6 +100,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); } @@ -58,7 +58,7 @@ void __init plat_mem_setup(void) { /* assume 16M as default incase uboot fails to pass proper ramsize */ -@@ -40,8 +42,8 @@ +@@ -40,8 +42,8 @@ void __init plat_mem_setup(void) } envp++; } |