From d1f448b466341c016f19a878b6faf700aa185887 Mon Sep 17 00:00:00 2001 From: jogo Date: Tue, 17 Apr 2012 12:50:54 +0000 Subject: kernel: update linux 3.2 to 3.2.15 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31335 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../lantiq/patches-3.2/0067-MIPS-lantiq-adds-bootsel-helper.patch | 7 ------- 1 file changed, 7 deletions(-) (limited to 'target/linux/lantiq/patches-3.2/0067-MIPS-lantiq-adds-bootsel-helper.patch') diff --git a/target/linux/lantiq/patches-3.2/0067-MIPS-lantiq-adds-bootsel-helper.patch b/target/linux/lantiq/patches-3.2/0067-MIPS-lantiq-adds-bootsel-helper.patch index 74f72107fc..081f4d69f9 100644 --- a/target/linux/lantiq/patches-3.2/0067-MIPS-lantiq-adds-bootsel-helper.patch +++ b/target/linux/lantiq/patches-3.2/0067-MIPS-lantiq-adds-bootsel-helper.patch @@ -8,8 +8,6 @@ Subject: [PATCH 67/73] MIPS: lantiq: adds bootsel helper arch/mips/lantiq/xway/reset.c | 12 +++++++++++- 2 files changed, 23 insertions(+), 1 deletions(-) -diff --git a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h -index bfdeb16..1ec8f2a 100644 --- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h +++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h @@ -144,6 +144,18 @@ @@ -31,8 +29,6 @@ index bfdeb16..1ec8f2a 100644 /* register access macros for EBU and CGU */ #define ltq_ebu_w32(x, y) ltq_w32((x), ltq_ebu_membase + (y)) #define ltq_ebu_r32(x) ltq_r32(ltq_ebu_membase + (x)) -diff --git a/arch/mips/lantiq/xway/reset.c b/arch/mips/lantiq/xway/reset.c -index 8a5dff1..b8f7ffb 100644 --- a/arch/mips/lantiq/xway/reset.c +++ b/arch/mips/lantiq/xway/reset.c @@ -27,7 +27,11 @@ @@ -61,6 +57,3 @@ index 8a5dff1..b8f7ffb 100644 void ltq_reset_once(unsigned int module, ulong usec) { ltq_rcu_w32(ltq_rcu_r32(RCU_RST_REQ) | module, RCU_RST_REQ); --- -1.7.9.1 - -- cgit v1.2.3