From 7d21744b723b484c45bdc7cc15ec66f64cc16b6b Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Tue, 26 Jan 2010 20:13:09 -0700
Subject: [PATCH] --- yaml --- r: 184653 b: refs/heads/master c:
 6ebe0d88f5fead21d6e1ac328acc683c173d26fc h: refs/heads/master i:   184651:
 e63492cdca6ea86da317498999eafd284ec5701e v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/mach-omap2/clock2xxx.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c92175ef212e..2ac2fcb65ca8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44da0a51032f3d90a441bd80c2efe68532104980
+refs/heads/master: 6ebe0d88f5fead21d6e1ac328acc683c173d26fc
diff --git a/trunk/arch/arm/mach-omap2/clock2xxx.c b/trunk/arch/arm/mach-omap2/clock2xxx.c
index b59cb1d2bf55..e5b9851b7419 100644
--- a/trunk/arch/arm/mach-omap2/clock2xxx.c
+++ b/trunk/arch/arm/mach-omap2/clock2xxx.c
@@ -50,6 +50,8 @@ struct clk *vclk, *sclk, *dclk;
  * Omap24xx specific clock functions
  *-------------------------------------------------------------------------*/
 
+#ifdef CONFIG_ARCH_OMAP2430
+
 /**
  * omap2430_clk_i2chs_find_idlest - return CM_IDLEST info for 2430 I2CHS
  * @clk: struct clk * being enabled
@@ -69,6 +71,10 @@ static void omap2430_clk_i2chs_find_idlest(struct clk *clk,
 	*idlest_bit = clk->enable_bit;
 }
 
+#else
+#define omap2430_clk_i2chs_find_idlest	NULL
+#endif
+
 /* 2430 I2CHS has non-standard IDLEST register */
 const struct clkops clkops_omap2430_i2chs_wait = {
 	.enable		= omap2_dflt_clk_enable,