projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update linux 3.2 to 3.2.13 and refresh patches
[openwrt.git]
/
target
/
linux
/
lantiq
/
patches-3.2
/
0038-MIPS-lantiq-add-additional-soc-ids.patch
diff --git
a/target/linux/lantiq/patches-3.2/0038-MIPS-lantiq-add-additional-soc-ids.patch
b/target/linux/lantiq/patches-3.2/0038-MIPS-lantiq-add-additional-soc-ids.patch
index
d5ab384
..
33e2514
100644
(file)
--- a/
target/linux/lantiq/patches-3.2/0038-MIPS-lantiq-add-additional-soc-ids.patch
+++ b/
target/linux/lantiq/patches-3.2/0038-MIPS-lantiq-add-additional-soc-ids.patch
@@
-8,8
+8,6
@@
Subject: [PATCH 38/70] MIPS: lantiq: add additional soc ids
arch/mips/lantiq/xway/prom.c | 35 ++++++++++++++++--
2 files changed, 61 insertions(+), 12 deletions(-)
arch/mips/lantiq/xway/prom.c | 35 ++++++++++++++++--
2 files changed, 61 insertions(+), 12 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 5d11eb7..3f22acb 100644
--- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
+++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
@@ -17,20 +17,32 @@
--- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
+++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
@@ -17,20 +17,32 @@
@@
-73,8
+71,6
@@
index 5d11eb7..3f22acb 100644
}
static inline int ltq_is_falcon(void)
}
static inline int ltq_is_falcon(void)
-diff --git a/arch/mips/lantiq/xway/prom.c b/arch/mips/lantiq/xway/prom.c
-index b6f56b7..e3dcbbd 100644
--- a/arch/mips/lantiq/xway/prom.c
+++ b/arch/mips/lantiq/xway/prom.c
@@ -18,7 +18,9 @@
--- a/arch/mips/lantiq/xway/prom.c
+++ b/arch/mips/lantiq/xway/prom.c
@@ -18,7 +18,9 @@
@@
-95,7
+91,7
@@
index b6f56b7..e3dcbbd 100644
void __init ltq_soc_detect(struct ltq_soc_info *i)
{
void __init ltq_soc_detect(struct ltq_soc_info *i)
{
-@@ -46,13 +47,21 @@ void __init ltq_soc_detect(struct ltq_so
c_info *i)
+@@ -46,13 +47,21 @@ void __init ltq_soc_detect(struct ltq_so
break;
case SOC_ID_ARX188:
break;
case SOC_ID_ARX188:
@@
-119,7
+115,7
@@
index b6f56b7..e3dcbbd 100644
i->name = SOC_AMAZON_SE;
i->type = SOC_TYPE_AMAZON_SE;
#ifdef CONFIG_PCI
i->name = SOC_AMAZON_SE;
i->type = SOC_TYPE_AMAZON_SE;
#ifdef CONFIG_PCI
-@@ -60,12 +69,30 @@ void __init ltq_soc_detect(struct ltq_so
c_info *i)
+@@ -60,12 +69,30 @@ void __init ltq_soc_detect(struct ltq_so
#endif
break;
#endif
break;
@@
-151,6
+147,3
@@
index b6f56b7..e3dcbbd 100644
default:
unreachable();
break;
default:
unreachable();
break;
---
-1.7.7.1
-
This page took
0.02282 seconds
and
4
git commands to generate.