From 7bc63df495148386c051132ba0dfe7117f130042 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 3 Nov 2006 17:48:17 +0000
Subject: [PATCH] --- yaml --- r: 40773 b: refs/heads/master c:
 2002d2bde1a9ad10e2521b8b117c11abfbc2ee93 h: refs/heads/master i:   40771:
 db7099d77ac50aaacc28e62551e0aba8be01da5a v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/mips/momentum/ocelot_c/prom.c  | 2 +-
 trunk/arch/mips/momentum/ocelot_c/setup.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ca409f23d264..bc291a0923f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c422e2ad6a1d8bd03e2e9d49e5c63b82165d596
+refs/heads/master: 2002d2bde1a9ad10e2521b8b117c11abfbc2ee93
diff --git a/trunk/arch/mips/momentum/ocelot_c/prom.c b/trunk/arch/mips/momentum/ocelot_c/prom.c
index 4c50a147f429..1f67728d6a49 100644
--- a/trunk/arch/mips/momentum/ocelot_c/prom.c
+++ b/trunk/arch/mips/momentum/ocelot_c/prom.c
@@ -29,7 +29,7 @@
 struct callvectors* debug_vectors;
 
 extern unsigned long marvell_base;
-extern unsigned long cpu_clock;
+extern unsigned int cpu_clock;
 
 #ifdef CONFIG_MV643XX_ETH
 extern unsigned char prom_mac_addr_base[6];
diff --git a/trunk/arch/mips/momentum/ocelot_c/setup.c b/trunk/arch/mips/momentum/ocelot_c/setup.c
index 0a3ffa33771d..7832d4e04c38 100644
--- a/trunk/arch/mips/momentum/ocelot_c/setup.c
+++ b/trunk/arch/mips/momentum/ocelot_c/setup.c
@@ -70,7 +70,7 @@
 #include "ocelot_c_fpga.h"
 
 unsigned long marvell_base;
-unsigned long cpu_clock;
+unsigned int cpu_clock;
 
 /* These functions are used for rebooting or halting the machine*/
 extern void momenco_ocelot_restart(char *command);