ar71xx: merge dev-ar9{13,34}x-wmac into dev-ar9xxx-wmac

[openwrt.git] / target / linux / lantiq / patches / 810-ar9-cache-split.patch

diff --git a/target/linux/lantiq/patches/810-ar9-cache-split.patch b/target/linux/lantiq/patches/810-ar9-cache-split.patch
index 9487f6c..d04f1e9 100644 (file)
--- a/target/linux/lantiq/patches/810-ar9-cache-split.patch
+++ b/target/linux/lantiq/patches/810-ar9-cache-split.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig

-@@ -1706,6 +1706,28 @@
+@@ -1844,6 +1844,28 @@

        help
          IFX included extensions in APRP
  
        help
          IFX included extensions in APRP
  


@@ -113,7 +113,7 @@
        write_vpe_c0_cause(0);
 --- a/arch/mips/mm/c-r4k.c
 +++ b/arch/mips/mm/c-r4k.c
        write_vpe_c0_cause(0);
 --- a/arch/mips/mm/c-r4k.c
 +++ b/arch/mips/mm/c-r4k.c

-@@ -1348,6 +1348,106 @@
+@@ -1347,6 +1347,106 @@

  __setup("coherentio", setcoherentio);
  #endif
  
  __setup("coherentio", setcoherentio);
  #endif
  


@@ -220,7 +220,7 @@
  void __cpuinit r4k_cache_init(void)
  {
        extern void build_clear_page(void);
  void __cpuinit r4k_cache_init(void)
  {
        extern void build_clear_page(void);

-@@ -1367,6 +1467,78 @@
+@@ -1366,6 +1466,78 @@

                break;
        }
  
                break;
        }