diff options
| author | Sean Paul <seanpaul@chromium.org> | 2018-02-16 15:47:43 -0500 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2018-02-16 15:47:43 -0500 |
| commit | d4da404f36b24b089d20db1fb27d8f99cb66f409 (patch) | |
| tree | 349c4b792281826652eb9e6d7a46ed6622dc90de /include/linux/clkdev.h | |
| parent | fa4127c5eb8def998fd8a471d51a4f2560dea0a2 (diff) | |
| parent | 933519a5a269d8460450545adefcb5caec622cac (diff) | |
Merge airlied/drm-next into drm-misc-next
Backmerge 4.15 and hdcp topic branch
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'include/linux/clkdev.h')
| -rw-r--r-- | include/linux/clkdev.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/clkdev.h b/include/linux/clkdev.h index 2eabc862abdb..4890ff033220 100644 --- a/include/linux/clkdev.h +++ b/include/linux/clkdev.h @@ -12,7 +12,7 @@ #ifndef __CLKDEV_H #define __CLKDEV_H -#include <asm/clkdev.h> +#include <linux/slab.h> struct clk; struct clk_hw; @@ -52,9 +52,4 @@ int clk_add_alias(const char *, const char *, const char *, struct device *); int clk_register_clkdev(struct clk *, const char *, const char *); int clk_hw_register_clkdev(struct clk_hw *, const char *, const char *); -#ifdef CONFIG_COMMON_CLK -int __clk_get(struct clk *clk); -void __clk_put(struct clk *clk); -#endif - #endif |