---

yaml --- r: 40773 b: refs/heads/master c: 2002d2b h: refs/heads/master i: 40771: db7099d v: v3
git-mirror · Nov 6, 2006 · 7bc63df · 7bc63df
1 parent 585b684
commit 7bc63df
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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);