diff --git a/[refs] b/[refs]
index 67ff56da61ed..3009c5e0bfde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 781b0f8d4f9c90137ea32771346ab49f0e5319b3
+refs/heads/master: e79f55a8c7aaae5a33e8c2b29682ec8e603b5434
diff --git a/trunk/arch/mips/mips-boards/generic/time.c b/trunk/arch/mips/mips-boards/generic/time.c
index c079e2ae02a1..659706705005 100644
--- a/trunk/arch/mips/mips-boards/generic/time.c
+++ b/trunk/arch/mips/mips-boards/generic/time.c
@@ -208,7 +208,7 @@ static unsigned int __init estimate_cpu_frequency(void)
 		count = 6000000;
 #endif
 #if defined(CONFIG_MIPS_ATLAS) || defined(CONFIG_MIPS_MALTA)
-	unsigned int flags;
+	unsigned long flags;
 
 	local_irq_save(flags);