diff options
| author | Mike Turquette <mturquette@linaro.org> | 2013-12-31 11:35:12 -0800 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2013-12-31 11:35:12 -0800 |
| commit | dbdf6ff51e3ce13ade5834b0d7d451522fcdb478 (patch) | |
| tree | b5594d70cf4d484101891adbfc01798c14827fa8 /arch/arm/include/asm/clkdev.h | |
| parent | 391e3903e63781debc52a0de73f2e922dcc3f602 (diff) | |
| parent | 9ffe29d780dd5f9c662f2c32f8dc64435da726bf (diff) | |
Merge branch 'clk-next-unregister' into clk-next
Conflicts:
drivers/clk/clk.c
Diffstat (limited to 'arch/arm/include/asm/clkdev.h')
| -rw-r--r-- | arch/arm/include/asm/clkdev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/clkdev.h b/arch/arm/include/asm/clkdev.h index 80751c15c30..4e8a4b27d7c 100644 --- a/arch/arm/include/asm/clkdev.h +++ b/arch/arm/include/asm/clkdev.h @@ -14,12 +14,14 @@ #include <linux/slab.h> +#ifndef CONFIG_COMMON_CLK #ifdef CONFIG_HAVE_MACH_CLKDEV #include <mach/clkdev.h> #else #define __clk_get(clk) ({ 1; }) #define __clk_put(clk) do { } while (0) #endif +#endif static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) { |