summaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.2/0067-MIPS-lantiq-adds-bootsel-helper.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-04-17 12:50:54 +0000
committerJonas Gorski <jogo@openwrt.org>2012-04-17 12:50:54 +0000
commitee4c47a134723b78162f9f5eedc9f132dd19f6b7 (patch)
tree34e93dc39c40a016b3bf5539f7de92400e114a9b /target/linux/lantiq/patches-3.2/0067-MIPS-lantiq-adds-bootsel-helper.patch
parentcfe30549a16b84e0d7caebd94fd7c2b81261de1a (diff)
downloadmaster-31e0f0ae-ee4c47a134723b78162f9f5eedc9f132dd19f6b7.tar.gz
master-31e0f0ae-ee4c47a134723b78162f9f5eedc9f132dd19f6b7.tar.bz2
master-31e0f0ae-ee4c47a134723b78162f9f5eedc9f132dd19f6b7.zip
kernel: update linux 3.2 to 3.2.15
SVN-Revision: 31335
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0067-MIPS-lantiq-adds-bootsel-helper.patch')
-rw-r--r--target/linux/lantiq/patches-3.2/0067-MIPS-lantiq-adds-bootsel-helper.patch7
1 files changed, 0 insertions, 7 deletions
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
-