diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-09-19 17:04:48 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-09-19 17:04:48 -0400 |
| commit | d99a910a00eded034c29aa3cb47b7b590784d331 (patch) | |
| tree | f872cb24d8eb415ddd6a75b763ea44993a1f16f6 /arch | |
| parent | 2b25d9f64b542cd19e020ce9d4d628c1feba96e5 (diff) | |
| parent | 20332ff376995daa08dcee2a193555800f17514b (diff) | |
Merge branch 'clkdev' into fixes
Diffstat (limited to 'arch')
| -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 = { | |||
| 146 | }; | 146 | }; |
| 147 | #endif /* MCFPM_PPMCR1 */ | 147 | #endif /* MCFPM_PPMCR1 */ |
| 148 | #endif /* MCFPM_PPMCR0 */ | 148 | #endif /* MCFPM_PPMCR0 */ |
| 149 | |||
| 150 | struct clk *devm_clk_get(struct device *dev, const char *id) | ||
| 151 | { | ||
| 152 | return NULL; | ||
| 153 | } | ||
| 154 | EXPORT_SYMBOL(devm_clk_get); | ||