diff options
author | Tony Lindgren <tony@atomide.com> | 2010-12-22 11:30:12 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-12-22 11:30:12 -0800 |
commit | c10abbb26513f4ccff89c4d80912cb4d36fcd3e8 (patch) | |
tree | b2a44e08e9e683078e9d20d6072a513798788314 /arch/mips/kernel/smp-mt.c | |
parent | 4931445b94f49672028b81ace9d4eee8ddf19ab2 (diff) | |
parent | da1f026b532ce944d74461497dc6d8c16456466e (diff) |
Merge branches 'devel-gpmc' and 'devel-misc' into omap-for-linus
Diffstat (limited to 'arch/mips/kernel/smp-mt.c')
-rw-r--r-- | arch/mips/kernel/smp-mt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c index 43e7cdc5ded2..c0e81418ba21 100644 --- a/arch/mips/kernel/smp-mt.c +++ b/arch/mips/kernel/smp-mt.c @@ -153,7 +153,7 @@ static void __cpuinit vsmp_init_secondary(void) { extern int gic_present; - /* This is Malta specific: IPI,performance and timer inetrrupts */ + /* This is Malta specific: IPI,performance and timer interrupts */ if (gic_present) change_c0_status(ST0_IM, STATUSF_IP3 | STATUSF_IP4 | STATUSF_IP6 | STATUSF_IP7); |