diff --git a/[refs] b/[refs] index 1f857ba97256..6dce7d33eb54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfb6f26035b17d5d280ce4a6ceb041438643ba63 +refs/heads/master: aea6863944efdf42b7de96e71545e0ce4c317a1f diff --git a/trunk/arch/mips/kernel/cevt-r4k.c b/trunk/arch/mips/kernel/cevt-r4k.c index bab935a3d74b..076f52b9bb79 100644 --- a/trunk/arch/mips/kernel/cevt-r4k.c +++ b/trunk/arch/mips/kernel/cevt-r4k.c @@ -276,7 +276,7 @@ void __cpuinit mips_clockevent_init(void) clockevents_register_device(cd); - if (!cp0_timer_irq_installed) + if (cp0_timer_irq_installed) return; cp0_timer_irq_installed = 1;