summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-09-19 22:04:48 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-09-19 22:04:48 +0100
commitd99a910a00eded034c29aa3cb47b7b590784d331 (patch)
treef872cb24d8eb415ddd6a75b763ea44993a1f16f6 /arch
parent2b25d9f64b542cd19e020ce9d4d628c1feba96e5 (diff)
parent20332ff376995daa08dcee2a193555800f17514b (diff)
downloadkernel-common-d99a910a00eded034c29aa3cb47b7b590784d331.tar.gz
kernel-common-d99a910a00eded034c29aa3cb47b7b590784d331.tar.bz2
kernel-common-d99a910a00eded034c29aa3cb47b7b590784d331.zip
Merge branch 'clkdev' into fixes
Diffstat (limited to 'arch')
-rw-r--r--arch/m68k/platform/coldfire/clk.c6
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);