build system cleanup/restructuring as described in http://lists.openwrt.org/pipermail...

[openwrt.git] / target / linux / brcm47xx-2.6 / patches-2.6.22 / 160-kmap_coherent.patch

diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/160-kmap_coherent.patch b/target/linux/brcm47xx-2.6/patches-2.6.22/160-kmap_coherent.patch
index 6706808..1267602 100644 (file)
--- a/target/linux/brcm47xx-2.6/patches-2.6.22/160-kmap_coherent.patch
+++ b/target/linux/brcm47xx-2.6/patches-2.6.22/160-kmap_coherent.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.22-rc4/arch/mips/mm/init.c
+Index: linux-2.6.22-rc6/arch/mips/mm/init.c
 ===================================================================
---- linux-2.6.22-rc4.orig/arch/mips/mm/init.c  2007-06-10 21:32:12.000000000 +0100
-+++ linux-2.6.22-rc4/arch/mips/mm/init.c       2007-06-10 21:33:21.000000000 +0100
+--- linux-2.6.22-rc6.orig/arch/mips/mm/init.c  2007-07-04 02:17:11.423962000 +0200
++++ linux-2.6.22-rc6/arch/mips/mm/init.c       2007-07-04 02:17:31.269202250 +0200
 @@ -207,7 +207,7 @@
        void *vfrom, *vto;
  
@@ -29,10 +29,10 @@ Index: linux-2.6.22-rc4/arch/mips/mm/init.c
                void *vfrom =
                        kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
                memcpy(dst, vfrom, len);
-Index: linux-2.6.22-rc4/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h
+Index: linux-2.6.22-rc6/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-rc4/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h    2007-06-10 21:33:21.000000000 +0100
++++ linux-2.6.22-rc6/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h    2007-07-04 02:17:31.273202500 +0200
 @@ -0,0 +1,13 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
@@ -47,10 +47,10 @@ Index: linux-2.6.22-rc4/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h
 +#define cpu_use_kmap_coherent 0
 +
 +#endif /* __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H */
-Index: linux-2.6.22-rc4/include/asm-mips/cpu-features.h
+Index: linux-2.6.22-rc6/include/asm-mips/cpu-features.h
 ===================================================================
---- linux-2.6.22-rc4.orig/include/asm-mips/cpu-features.h      2007-06-10 21:32:12.000000000 +0100
-+++ linux-2.6.22-rc4/include/asm-mips/cpu-features.h   2007-06-10 21:33:21.000000000 +0100
+--- linux-2.6.22-rc6.orig/include/asm-mips/cpu-features.h      2007-07-04 02:17:11.455964000 +0200
++++ linux-2.6.22-rc6/include/asm-mips/cpu-features.h   2007-07-04 02:17:31.305204500 +0200
 @@ -101,6 +101,9 @@
  #ifndef cpu_has_pindexed_dcache
  #define cpu_has_pindexed_dcache       (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)