From ffdf4868a12a16ca650edb884266b50d9fa3b87f Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Mon, 25 Jan 2010 12:58:19 +0200
Subject: [PATCH] --- yaml --- r: 180263 b: refs/heads/master c:
 fadc095622dd188cae88eb2f3ff28fd6e9d2d2f1 h: refs/heads/master i:   180261:
 428d91b52600353fbf55bb6d288f9706b6165514   180259:
 1eac20caaa2e265e32179337717824b06cb3cd78   180255:
 89547182fa8099755241d5cb7d1c38cccdfc2d6c v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/mach-mx25/clock.c              | 2 +-
 trunk/arch/arm/mach-mx25/mx25pdk.c            | 2 +-
 trunk/arch/arm/plat-mxc/include/mach/common.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a2155e3d227f..1c66a6dfec76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cd3f96cd4014419a4ea524d840be0fa39e3ddbc
+refs/heads/master: fadc095622dd188cae88eb2f3ff28fd6e9d2d2f1
diff --git a/trunk/arch/arm/mach-mx25/clock.c b/trunk/arch/arm/mach-mx25/clock.c
index 3be51dd46c67..abd303bc3bf2 100644
--- a/trunk/arch/arm/mach-mx25/clock.c
+++ b/trunk/arch/arm/mach-mx25/clock.c
@@ -211,7 +211,7 @@ static struct clk_lookup lookups[] = {
 	_REGISTER_CLOCK("fec.0", NULL, fec_clk)
 };
 
-int __init mx25_clocks_init(unsigned long fref)
+int __init mx25_clocks_init(void)
 {
 	int i;
 
diff --git a/trunk/arch/arm/mach-mx25/mx25pdk.c b/trunk/arch/arm/mach-mx25/mx25pdk.c
index 921bc99ea231..6f06089246eb 100644
--- a/trunk/arch/arm/mach-mx25/mx25pdk.c
+++ b/trunk/arch/arm/mach-mx25/mx25pdk.c
@@ -91,7 +91,7 @@ static void __init mx25pdk_init(void)
 
 static void __init mx25pdk_timer_init(void)
 {
-	mx25_clocks_init(26000000);
+	mx25_clocks_init();
 }
 
 static struct sys_timer mx25pdk_timer = {
diff --git a/trunk/arch/arm/plat-mxc/include/mach/common.h b/trunk/arch/arm/plat-mxc/include/mach/common.h
index 286cb9b0a25b..4bf1068ffad9 100644
--- a/trunk/arch/arm/plat-mxc/include/mach/common.h
+++ b/trunk/arch/arm/plat-mxc/include/mach/common.h
@@ -32,7 +32,7 @@ extern void mxc91231_init_irq(void);
 extern void mxc_timer_init(struct clk *timer_clk, void __iomem *, int);
 extern int mx1_clocks_init(unsigned long fref);
 extern int mx21_clocks_init(unsigned long lref, unsigned long fref);
-extern int mx25_clocks_init(unsigned long fref);
+extern int mx25_clocks_init(void);
 extern int mx27_clocks_init(unsigned long fref);
 extern int mx31_clocks_init(unsigned long fref);
 extern int mx35_clocks_init(void);