Merge remote branch 'kumar/merge' into merge

[pandora-kernel.git] / arch / frv / kernel / entry-table.S

diff --git a/arch/frv/kernel/entry-table.S b/arch/frv/kernel/entry-table.S
index bf35f33..06c5ae1 100644 (file)
--- a/arch/frv/kernel/entry-table.S
+++ b/arch/frv/kernel/entry-table.S
@@ -86,7 +86,7 @@ __break_usertrap_fixup_table:
        .globl          __break_kerneltrap_fixup_table
 __break_kerneltrap_fixup_table:
 
-       # handler declaration for a sofware or program interrupt
+       # handler declaration for a software or program interrupt
 .macro VECTOR_SOFTPROG tbr_tt, vec
        .section .trap.user
        .org            \tbr_tt
@@ -145,7 +145,7 @@ __break_kerneltrap_fixup_table:
        .long           \vec
 .endm
 
-       # handler declaration for an MMU only sofware or program interrupt
+       # handler declaration for an MMU only software or program interrupt
 .macro VECTOR_SP_MMU tbr_tt, vec
 #ifdef CONFIG_MMU
        VECTOR_SOFTPROG \tbr_tt, \vec