Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[pandora-kernel.git] / arch / mips / kernel / time.c

diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index fb74974..1083ad4 100644 (file)
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -102,7 +102,7 @@ static __init int cpu_has_mfc0_count_bug(void)
        case CPU_R4400SC:
        case CPU_R4400MC:
                /*
-                * The published errata for the R4400 upto 3.0 say the CPU
+                * The published errata for the R4400 up to 3.0 say the CPU
                 * has the mfc0 from count bug.
                 */
                if ((current_cpu_data.processor_id & 0xff) <= 0x30)