Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[pandora-kernel.git] / arch / arm / mm / cache-v4.S

diff --git a/arch/arm/mm/cache-v4.S b/arch/arm/mm/cache-v4.S
index a8fefb5..fd9bb7a 100644 (file)
--- a/arch/arm/mm/cache-v4.S
+++ b/arch/arm/mm/cache-v4.S
@@ -141,16 +141,5 @@ ENDPROC(v4_dma_map_area)
 
        __INITDATA
 
-       .type   v4_cache_fns, #object
-ENTRY(v4_cache_fns)
-       .long   v4_flush_icache_all
-       .long   v4_flush_kern_cache_all
-       .long   v4_flush_user_cache_all
-       .long   v4_flush_user_cache_range
-       .long   v4_coherent_kern_range
-       .long   v4_coherent_user_range
-       .long   v4_flush_kern_dcache_area
-       .long   v4_dma_map_area
-       .long   v4_dma_unmap_area
-       .long   v4_dma_flush_range
-       .size   v4_cache_fns, . - v4_cache_fns
+       @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
+       define_cache_functions v4