diff options
author | Michael Turquette <mturquette@linaro.org> | 2015-02-02 14:59:38 -0800 |
---|---|---|
committer | Michael Turquette <mturquette@linaro.org> | 2015-02-02 14:59:38 -0800 |
commit | 54eea32f7ed3037c91853924227585b65df909a8 (patch) | |
tree | 4e3e9ece8a66f611e980ddc503ca7184db8f83fb /drivers/clk/ti/clk-44xx.c | |
parent | Linux 3.19-rc7 (diff) | |
parent | Merge tag 'v3.20-exynos-clk' of git://linuxtv.org/snawrocki/samsung into clk-next (diff) | |
download | linux-dev-54eea32f7ed3037c91853924227585b65df909a8.tar.xz linux-dev-54eea32f7ed3037c91853924227585b65df909a8.zip |
Merge branch 'clk-next' into v3.19-rc7
Diffstat (limited to 'drivers/clk/ti/clk-44xx.c')
-rw-r--r-- | drivers/clk/ti/clk-44xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/ti/clk-44xx.c b/drivers/clk/ti/clk-44xx.c index 02517a8206bd..4f4c87751db5 100644 --- a/drivers/clk/ti/clk-44xx.c +++ b/drivers/clk/ti/clk-44xx.c @@ -12,7 +12,7 @@ #include <linux/kernel.h> #include <linux/list.h> -#include <linux/clk-private.h> +#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/clk/ti.h> |