summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-27 12:48:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-27 12:48:39 -0700
commit6ebfbe9a1a92fdde66f0b7b017bf39ad7974fe17 (patch)
treea430ae2725d6f9bcdbd2307571e19913e7224cff
parent843760c58e7dc46a9325169ac72d27b3e2def426 (diff)
parent19a1d332cc8ca599578111b9ff8cd6963f75c387 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull a m68knommu fix from Greg Ungerer: "It contains a single fix for breakage using the Freescale FEC eth driver on ColdFire CPUs." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: define a local devm_clk_get() function
-rw-r--r--arch/m68k/platform/coldfire/clk.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/m68k/platform/coldfire/clk.c b/arch/m68k/platform/coldfire/clk.c
index 9f1260c5e2ad..44da406897e5 100644
--- a/arch/m68k/platform/coldfire/clk.c
+++ b/arch/m68k/platform/coldfire/clk.c
@@ -42,4 +42,11 @@ unsigned long clk_get_rate(struct clk *clk)
return MCF_CLK;
}
EXPORT_SYMBOL(clk_get_rate);
+
+struct clk *devm_clk_get(struct device *dev, const char *id)
+{
+ return NULL;
+}
+EXPORT_SYMBOL(devm_clk_get);
+
/***************************************************************************/