diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-25 19:03:56 +0200 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-25 19:03:56 +0200 |
| commit | 593d1006cdf710ab3469c0c37c184fea0bc3da97 (patch) | |
| tree | e4db58440018a52089e8d6b39160f753ab10df99 /arch/m68k | |
| parent | Merge remote-tracking branch 'tip/smp/hotplug' into next.2012.09.25b (diff) | |
| parent | Merge tag 'v3.6-rc7' into core/rcu (diff) | |
| download | linux-593d1006cdf710ab3469c0c37c184fea0bc3da97.tar.xz linux-593d1006cdf710ab3469c0c37c184fea0bc3da97.zip | |
Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b
Resolved conflict in kernel/sched/core.c using Peter Zijlstra's
approach from https://lkml.org/lkml/2012/9/5/585.
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/platform/coldfire/clk.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/m68k/platform/coldfire/clk.c b/arch/m68k/platform/coldfire/clk.c index 75f9ee967ea7..9cd13b4ce42b 100644 --- a/arch/m68k/platform/coldfire/clk.c +++ b/arch/m68k/platform/coldfire/clk.c @@ -146,9 +146,3 @@ struct clk_ops clk_ops1 = { }; #endif /* MCFPM_PPMCR1 */ #endif /* MCFPM_PPMCR0 */ - -struct clk *devm_clk_get(struct device *dev, const char *id) -{ - return NULL; -} -EXPORT_SYMBOL(devm_clk_get); |