diff options
author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-17 12:50:54 +0000 |
---|---|---|
committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-17 12:50:54 +0000 |
commit | d1f448b466341c016f19a878b6faf700aa185887 (patch) | |
tree | 7884a0e5485ce8383b2b63163b38e40ea60ffb3c /target/linux/lantiq/patches-3.2/0037-MIPS-lantiq-add-additional-soc-ids.patch | |
parent | 9250e93065e309842d71711320dba9722802d2ab (diff) |
kernel: update linux 3.2 to 3.2.15
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31335 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0037-MIPS-lantiq-add-additional-soc-ids.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.2/0037-MIPS-lantiq-add-additional-soc-ids.patch | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/lantiq/patches-3.2/0037-MIPS-lantiq-add-additional-soc-ids.patch b/target/linux/lantiq/patches-3.2/0037-MIPS-lantiq-add-additional-soc-ids.patch index e0d1a979b..03e0cf31c 100644 --- a/target/linux/lantiq/patches-3.2/0037-MIPS-lantiq-add-additional-soc-ids.patch +++ b/target/linux/lantiq/patches-3.2/0037-MIPS-lantiq-add-additional-soc-ids.patch @@ -8,8 +8,6 @@ Subject: [PATCH 37/73] 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.9.1 - |