diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2012-04-01 07:56:55 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-01 07:56:55 +0000 |
| commit | d87efd8c3c2acd5d0f96b25514282a84f425419f (patch) | |
| tree | 1d89c8f9fb694414d9ae46d89bddf584f94c9b00 /target/linux/lantiq/patches-3.2/0038-MIPS-lantiq-add-additional-soc-ids.patch | |
| parent | 1a395bd290a84223da5d915b7e38b6ca23d14c09 (diff) | |
| download | master-31e0f0ae-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.gz master-31e0f0ae-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.bz2 master-31e0f0ae-d87efd8c3c2acd5d0f96b25514282a84f425419f.zip | |
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic).
SVN-Revision: 31158
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0038-MIPS-lantiq-add-additional-soc-ids.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.2/0038-MIPS-lantiq-add-additional-soc-ids.patch | 11 |
1 files changed, 2 insertions, 9 deletions
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 d5ab3843cd..33e25146d8 100644 --- 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(-) -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 - |