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
mariux64 · Jun 27, 2012 · 6ebfbe9 · 6ebfbe9
2 parents 843760c + 19a1d33
commit 6ebfbe9
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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);
+
 /***************************************************************************/