Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
3d230060 · Linus Torvalds · e75276ad · 7eac2191 · 3d230060 · 3d230060
Commit 3d230060 authored Feb 07, 2005 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

arch/arm/mm/tlb-v4.S arch/arm/mm/tlb-v4.S +1 -1

arch/arm/mm/tlb-v4wb.S arch/arm/mm/tlb-v4wb.S +1 -1

No files found.
--- a/arch/arm/mm/tlb-v4.S
+++ b/arch/arm/mm/tlb-v4.S
@@ -44,7 +44,7 @@ ENTRY(v4_flush_user_tlb_range)
 	mov	pc, lr

 /*
- *	v4_flush_kerm_tlb_range(start, end)
+ *	v4_flush_kern_tlb_range(start, end)
 *
 *	Invalidate a range of TLB entries in the specified kernel
 *	address range.

--- a/arch/arm/mm/tlb-v4wb.S
+++ b/arch/arm/mm/tlb-v4wb.S
@@ -47,7 +47,7 @@ ENTRY(v4wb_flush_user_tlb_range)
 	mov	pc, lr

 /*
- *	v4_flush_kerm_tlb_range(start, end)
+ *	v4_flush_kern_tlb_range(start, end)
 *
 *	Invalidate a range of TLB entries in the specified kernel
 *	address range.