mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic). git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31158 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -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(-)
|
||||
|
||||
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 @@
|
||||
@@ -73,8 +71,6 @@ index 5d11eb7..3f22acb 100644
|
||||
}
|
||||
|
||||
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 @@
|
||||
@@ -95,7 +91,7 @@ index b6f56b7..e3dcbbd 100644
|
||||
|
||||
void __init ltq_soc_detect(struct ltq_soc_info *i)
|
||||
{
|
||||
@@ -46,13 +47,21 @@ void __init ltq_soc_detect(struct ltq_soc_info *i)
|
||||
@@ -46,13 +47,21 @@ void __init ltq_soc_detect(struct ltq_so
|
||||
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
|
||||
@@ -60,12 +69,30 @@ void __init ltq_soc_detect(struct ltq_soc_info *i)
|
||||
@@ -60,12 +69,30 @@ void __init ltq_soc_detect(struct ltq_so
|
||||
#endif
|
||||
break;
|
||||
|
||||
@@ -151,6 +147,3 @@ index b6f56b7..e3dcbbd 100644
|
||||
default:
|
||||
unreachable();
|
||||
break;
|
||||
--
|
||||
1.7.7.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user