diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-01-17 01:13:46 +0400 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-01-17 01:13:46 +0400 |
| commit | 0099d8851681a550065e36fe89719616ab5f63d4 (patch) | |
| tree | 8881a7064ff68cc97c71abd4b5bd1a67de314871 /arch/sh | |
| parent | d6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc (diff) | |
| parent | 2e84d75116c17c2034e917b411250d2d11755435 (diff) | |
| download | linux-0099d8851681a550065e36fe89719616ab5f63d4.tar.xz | |
Merge remote-tracking branch 'linaro/clk-next' into clk-next
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/clkdev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/include/asm/clkdev.h b/arch/sh/include/asm/clkdev.h index 6ba91868201c..c41901465fb0 100644 --- a/arch/sh/include/asm/clkdev.h +++ b/arch/sh/include/asm/clkdev.h @@ -25,7 +25,9 @@ static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) return kzalloc(size, GFP_KERNEL); } +#ifndef CONFIG_COMMON_CLK #define __clk_put(clk) #define __clk_get(clk) ({ 1; }) +#endif #endif /* __CLKDEV_H__ */ |