From 372f5756ac7b11dcff67157c535c437dd523ee33 Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Tue, 26 Jan 2010 20:13:11 -0700
Subject: [PATCH] --- yaml --- r: 184659 b: refs/heads/master c:
 d3730192294c1c98b17a67aadbbdc4c28ad05c6e h: refs/heads/master i:   184657:
 cb1a3689908548145f6e4f6b97b84d2f55f87f34   184655:
 2da8c5dd94e7077e2503385f11bd633278a619be v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/plat-omap/clock.c              | 2 +-
 trunk/arch/arm/plat-omap/include/plat/clock.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 12fa5c50fde0..8caebbc94bca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60c3f65191d077dc4f69fca8eca39fb47f72d8b0
+refs/heads/master: d3730192294c1c98b17a67aadbbdc4c28ad05c6e
diff --git a/trunk/arch/arm/plat-omap/clock.c b/trunk/arch/arm/plat-omap/clock.c
index e0f72f48b8b1..0ae27538385d 100644
--- a/trunk/arch/arm/plat-omap/clock.c
+++ b/trunk/arch/arm/plat-omap/clock.c
@@ -173,7 +173,7 @@ EXPORT_SYMBOL(clk_get_parent);
  * OMAP specific clock functions shared between omap1 and omap2
  *-------------------------------------------------------------------------*/
 
-unsigned int __initdata mpurate;
+int __initdata mpurate;
 
 /*
  * By default we use the rate set by the bootloader.
diff --git a/trunk/arch/arm/plat-omap/include/plat/clock.h b/trunk/arch/arm/plat-omap/include/plat/clock.h
index 896cedc923a7..e41313208125 100644
--- a/trunk/arch/arm/plat-omap/include/plat/clock.h
+++ b/trunk/arch/arm/plat-omap/include/plat/clock.h
@@ -123,7 +123,7 @@ struct clk_functions {
 #endif
 };
 
-extern unsigned int mpurate;
+extern int mpurate;
 
 extern int clk_init(struct clk_functions *custom_clocks);
 extern void clk_preinit(struct clk *clk);