kernel: update linux 3.8 to 3.8.6

[openwrt/staging/wigyori.git] / target / linux / lantiq / patches-3.8 / 0200-MIPS-read-the-mips_machine-name-from-OF-and-output-i.patch

diff --git a/target/linux/lantiq/patches-3.8/0200-MIPS-read-the-mips_machine-name-from-OF-and-output-i.patch b/target/linux/lantiq/patches-3.8/0200-MIPS-read-the-mips_machine-name-from-OF-and-output-i.patch
index 3bdd136f95fbecf4431392881f2b23ae3eb4fa53..21d9ee0a3c1f13b160cbf0c69cd6370246019942 100644 (file)
--- a/target/linux/lantiq/patches-3.8/0200-MIPS-read-the-mips_machine-name-from-OF-and-output-i.patch
+++ b/target/linux/lantiq/patches-3.8/0200-MIPS-read-the-mips_machine-name-from-OF-and-output-i.patch
@@ -13,11 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  arch/mips/kernel/prom.c      |   24 ++++++++++++++++++++++++
  3 files changed, 32 insertions(+), 1 deletion(-)
 
-diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h
-index 8808bf5..a4ad354 100644
 --- a/arch/mips/include/asm/prom.h
 +++ b/arch/mips/include/asm/prom.h
-@@ -44,8 +44,11 @@ extern void __dt_setup_arch(struct boot_param_header *bph);
+@@ -44,8 +44,11 @@ extern void __dt_setup_arch(struct boot_
        __dt_setup_arch(&__dtb_##sym##_begin);                          \
  })
  
@@ -29,8 +27,6 @@ index 8808bf5..a4ad354 100644
  #endif /* CONFIG_OF */
  
  #endif /* __ASM_PROM_H */
-diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
-index 135c4aa..9ab3d13 100644
 --- a/arch/mips/kernel/proc.c
 +++ b/arch/mips/kernel/proc.c
 @@ -12,6 +12,7 @@
@@ -41,7 +37,7 @@ index 135c4aa..9ab3d13 100644
  #include <asm/mips_machine.h>
  
  unsigned int vced_count, vcei_count;
-@@ -34,7 +35,10 @@ static int show_cpuinfo(struct seq_file *m, void *v)
+@@ -34,7 +35,10 @@ static int show_cpuinfo(struct seq_file
         */
        if (n == 0) {
                seq_printf(m, "system type\t\t: %s\n", get_system_type());
@@ -53,8 +49,6 @@ index 135c4aa..9ab3d13 100644
                        seq_printf(m, "machine\t\t\t: %s\n",
                                   mips_get_machine_name());
        }
-diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
-index 028f6f8..1aa68a2 100644
 --- a/arch/mips/kernel/prom.c
 +++ b/arch/mips/kernel/prom.c
 @@ -23,6 +23,13 @@
@@ -71,7 +65,7 @@ index 028f6f8..1aa68a2 100644
  int __init early_init_dt_scan_memory_arch(unsigned long node,
                                          const char *uname, int depth,
                                          void *data)
-@@ -50,6 +57,20 @@ void __init early_init_dt_setup_initrd_arch(unsigned long start,
+@@ -50,6 +57,20 @@ void __init early_init_dt_setup_initrd_a
  }
  #endif
  
@@ -92,7 +86,7 @@ index 028f6f8..1aa68a2 100644
  void __init early_init_devtree(void *params)
  {
        /* Setup flat device-tree pointer */
-@@ -65,6 +86,9 @@ void __init early_init_devtree(void *params)
+@@ -65,6 +86,9 @@ void __init early_init_devtree(void *par
        /* Scan memory nodes */
        of_scan_flat_dt(early_init_dt_scan_root, NULL);
        of_scan_flat_dt(early_init_dt_scan_memory_arch, NULL);
@@ -102,6 +96,3 @@ index 028f6f8..1aa68a2 100644
  }
  
  void __init __dt_setup_arch(struct boot_param_header *bph)
--- 
-1.7.10.4
-