diff options
| author | Mike Turquette <mturquette@linaro.org> | 2013-12-04 12:14:59 -0800 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2013-12-04 12:14:59 -0800 |
| commit | 9ffe29d780dd5f9c662f2c32f8dc64435da726bf (patch) | |
| tree | f583f02351c36f50c43b7e4eb2dc7d2bc6ed2dab /arch/mips/include/asm/clkdev.h | |
| parent | cdf64eeeb0d762585e2126f3024458d199c2635d (diff) | |
| parent | fcb0ee6a3d331fb23dbb546500021f6e4cac5689 (diff) | |
Merge branch 'clk/clk-unregister' of git://linuxtv.org/snawrocki/samsung into clk-next-unregister
Diffstat (limited to 'arch/mips/include/asm/clkdev.h')
| -rw-r--r-- | arch/mips/include/asm/clkdev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/include/asm/clkdev.h b/arch/mips/include/asm/clkdev.h index 262475414e5..1b3ad7b09dc 100644 --- a/arch/mips/include/asm/clkdev.h +++ b/arch/mips/include/asm/clkdev.h @@ -14,8 +14,10 @@ #include <linux/slab.h> +#ifndef CONFIG_COMMON_CLK #define __clk_get(clk) ({ 1; }) #define __clk_put(clk) do { } while (0) +#endif static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) { |