Commit 6ebfbe9a authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://

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://
  m68knommu: define a local devm_clk_get() function
parents 843760c5 19a1d332
......@@ -42,4 +42,11 @@ unsigned long clk_get_rate(struct clk *clk)
return MCF_CLK;
struct clk *devm_clk_get(struct device *dev, const char *id)
return NULL;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment