Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / blackfin / kernel / traps.c

diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 59c1df7..655f25d 100644 (file)
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -98,7 +98,7 @@ asmlinkage notrace void trap_c(struct pt_regs *fp)
        /* send the appropriate signal to the user program */
        switch (trapnr) {
 
-       /* This table works in conjuction with the one in ./mach-common/entry.S
+       /* This table works in conjunction with the one in ./mach-common/entry.S
         * Some exceptions are handled there (in assembly, in exception space)
         * Some are handled here, (in C, in interrupt space)
         * Some, like CPLB, are handled in both, where the normal path is