Clean up the prom code / board detection (thanks Gabor), fix some warnings

[openwrt.git] / target / linux / generic-2.6 / patches / 012-mips_cpu_tlb.patch

diff --git a/target/linux/generic-2.6/patches/012-mips_cpu_tlb.patch b/target/linux/generic-2.6/patches/012-mips_cpu_tlb.patch
index 90f2d94..85b31e3 100644 (file)
--- a/target/linux/generic-2.6/patches/012-mips_cpu_tlb.patch
+++ b/target/linux/generic-2.6/patches/012-mips_cpu_tlb.patch
@@ -1,7 +1,7 @@
-diff -Nur linux-2.6.17/arch/mips/mm/tlbex.c linux-2.6.17-owrt/arch/mips/mm/tlbex.c
---- linux-2.6.17/arch/mips/mm/tlbex.c  2006-06-18 03:49:35.000000000 +0200
-+++ linux-2.6.17-owrt/arch/mips/mm/tlbex.c     2006-06-18 12:48:27.000000000 +0200
-@@ -876,7 +876,6 @@
+diff -urN linux-2.6.21.1.old/arch/mips/mm/tlbex.c linux-2.6.21.1.dev/arch/mips/mm/tlbex.c
+--- linux-2.6.21.1.old/arch/mips/mm/tlbex.c    2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/arch/mips/mm/tlbex.c    2007-05-26 19:50:19.046030304 +0200
+@@ -887,7 +887,6 @@
        case CPU_R10000:
        case CPU_R12000:
        case CPU_R14000:
@@ -9,7 +9,7 @@ diff -Nur linux-2.6.17/arch/mips/mm/tlbex.c linux-2.6.17-owrt/arch/mips/mm/tlbex
        case CPU_SB1:
        case CPU_SB1A:
        case CPU_4KSC:
-@@ -904,6 +903,7 @@
+@@ -915,6 +914,7 @@
                tlbw(p);
                break;
  
@@ -17,4 +17,3 @@ diff -Nur linux-2.6.17/arch/mips/mm/tlbex.c linux-2.6.17-owrt/arch/mips/mm/tlbex
        case CPU_4KEC:
        case CPU_24K:
        case CPU_34K:
-