Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / arch / arm / mm / tlb-v4wb.S

diff --git a/arch/arm/mm/tlb-v4wb.S b/arch/arm/mm/tlb-v4wb.S
index cb829ca..c04598f 100644 (file)
--- a/arch/arm/mm/tlb-v4wb.S
+++ b/arch/arm/mm/tlb-v4wb.S
@@ -69,9 +69,5 @@ ENTRY(v4wb_flush_kern_tlb_range)
 
        __INITDATA
 
-       .type   v4wb_tlb_fns, #object
-ENTRY(v4wb_tlb_fns)
-       .long   v4wb_flush_user_tlb_range
-       .long   v4wb_flush_kern_tlb_range
-       .long   v4wb_tlb_flags
-       .size   v4wb_tlb_fns, . - v4wb_tlb_fns
+       /* define struct cpu_tlb_fns (see <asm/tlbflush.h> and proc-macros.S) */
+       define_tlb_functions v4wb, v4wb_tlb_flags