From c798b6768c27266fa31a55668114c898ee10bcee Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 31 Oct 2006 19:53:15 +0000
Subject: [PATCH] --- yaml --- r: 40559 b: refs/heads/master c:
 e79f55a8c7aaae5a33e8c2b29682ec8e603b5434 h: refs/heads/master i:   40557:
 287cab623f88f98f94cb432ef846cdfa38b198bf   40555:
 c41731c652a4afb08297b0d37143d07748bcf1b0   40551:
 279d6ab76d520cd94f2c5bc890b3616870f9b341   40543:
 e08c1ab53a858fcf9da57d24c3e4ebb0afd03650 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/mips/mips-boards/generic/time.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);