From 3b8909d08c8f26df5beeb6890e02e866a22ea715 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Fri, 13 Jul 2012 14:48:23 +1000
Subject: [PATCH] --- yaml --- r: 344923 b: refs/heads/master c:
 610ac9381e41e8bdcd5482c24028bc777404321f h: refs/heads/master i:   344921:
 8c5d261dab2fa4a17d006571439b8421a738a0e1   344919:
 88a6fa26799ab1c2afa01f1026fe3faf4b7a5cfe v: v3

---
 [refs]                               | 2 +-
 trunk/arch/m68k/include/asm/mcfclk.h | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 07d3619f0294..63dbafff022b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 423c01eac31fe9e6c9eee7bf45ace9abcd57251b
+refs/heads/master: 610ac9381e41e8bdcd5482c24028bc777404321f
diff --git a/trunk/arch/m68k/include/asm/mcfclk.h b/trunk/arch/m68k/include/asm/mcfclk.h
index b676a02bb392..ea4791e3a557 100644
--- a/trunk/arch/m68k/include/asm/mcfclk.h
+++ b/trunk/arch/m68k/include/asm/mcfclk.h
@@ -8,7 +8,6 @@
 
 struct clk;
 
-#ifdef MCFPM_PPMCR0
 struct clk_ops {
 	void (*enable)(struct clk *);
 	void (*disable)(struct clk *);
@@ -23,6 +22,8 @@ struct clk {
 };
 
 extern struct clk *mcf_clks[];
+
+#ifdef MCFPM_PPMCR0
 extern struct clk_ops clk_ops0;
 #ifdef MCFPM_PPMCR1
 extern struct clk_ops clk_ops1;
@@ -38,6 +39,12 @@ static struct clk __clk_##clk_bank##_##clk_slot = { \
 
 void __clk_init_enabled(struct clk *);
 void __clk_init_disabled(struct clk *);
+#else
+#define DEFINE_CLK(clk_ref, clk_name, clk_rate) \
+        static struct clk clk_##clk_ref = { \
+                .name = clk_name, \
+                .rate = clk_rate, \
+        }
 #endif /* MCFPM_PPMCR0 */
 
 #endif /* mcfclk_h */