diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-21 11:22:42 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-28 11:59:09 -0700 |
| commit | 9cfad9bc472a4bdd5ee7d9e713113a9f5a676704 (patch) | |
| tree | cd9b055e0859e83676c0b6cb98b9cb3e53ad95f2 /drivers/clk/mediatek | |
| parent | 9da9e761273702b3afd6e3538c23ece95693e586 (diff) | |
| parent | 61ae76563ec3b506235d5dd69c6fdacea321254d (diff) | |
| download | linux-9cfad9bc472a4bdd5ee7d9e713113a9f5a676704.tar.gz linux-9cfad9bc472a4bdd5ee7d9e713113a9f5a676704.tar.bz2 linux-9cfad9bc472a4bdd5ee7d9e713113a9f5a676704.zip | |
Merge branch 'cleanup-clk-h-includes' into clk-next
* cleanup-clk-h-includes: (62 commits)
clk: Remove clk.h from clk-provider.h
clk: h8300: Remove clk.h and clkdev.h includes
clk: at91: Include clk.h and slab.h
clk: ti: Switch clk-provider.h include to clk.h
clk: pistachio: Include clk.h
clk: ingenic: Include clk.h
clk: si570: Include clk.h
clk: moxart: Include clk.h
clk: cdce925: Include clk.h
clk: Include clk.h in clk.c
clk: zynq: Include clk.h
clk: ti: Include clk.h
clk: sunxi: Include clk.h and remove unused clkdev.h includes
clk: st: Include clk.h
clk: qcom: Include clk.h
clk: highbank: Include clk.h
clk: bcm: Include clk.h
clk: versatile: Remove clk.h and clkdev.h includes
clk: ux500: Remove clk.h and clkdev.h includes
clk: tegra: Properly include clk.h
...
Diffstat (limited to 'drivers/clk/mediatek')
| -rw-r--r-- | drivers/clk/mediatek/clk-gate.h | 3 | ||||
| -rw-r--r-- | drivers/clk/mediatek/clk-mt8135.c | 1 | ||||
| -rw-r--r-- | drivers/clk/mediatek/clk-mt8173.c | 1 | ||||
| -rw-r--r-- | drivers/clk/mediatek/clk-mtk.h | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/drivers/clk/mediatek/clk-gate.h b/drivers/clk/mediatek/clk-gate.h index 6b6780b1e9c5..11e25c992948 100644 --- a/drivers/clk/mediatek/clk-gate.h +++ b/drivers/clk/mediatek/clk-gate.h @@ -16,9 +16,10 @@ #define __DRV_CLK_GATE_H #include <linux/regmap.h> -#include <linux/clk.h> #include <linux/clk-provider.h> +struct clk; + struct mtk_clk_gate { struct clk_hw hw; struct regmap *regmap; diff --git a/drivers/clk/mediatek/clk-mt8135.c b/drivers/clk/mediatek/clk-mt8135.c index 08b4b849b491..07c21e44b4b3 100644 --- a/drivers/clk/mediatek/clk-mt8135.c +++ b/drivers/clk/mediatek/clk-mt8135.c @@ -12,6 +12,7 @@ * GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/slab.h> diff --git a/drivers/clk/mediatek/clk-mt8173.c b/drivers/clk/mediatek/clk-mt8173.c index cd3fad3ca993..90eff85f4285 100644 --- a/drivers/clk/mediatek/clk-mt8173.c +++ b/drivers/clk/mediatek/clk-mt8173.c @@ -12,6 +12,7 @@ * GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/slab.h> diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h index efea28d6e1e6..c5cbecb3d218 100644 --- a/drivers/clk/mediatek/clk-mtk.h +++ b/drivers/clk/mediatek/clk-mtk.h @@ -17,9 +17,10 @@ #include <linux/regmap.h> #include <linux/bitops.h> -#include <linux/clk.h> #include <linux/clk-provider.h> +struct clk; + #define MAX_MUX_GATE_BIT 31 #define INVALID_MUX_GATE_BIT (MAX_MUX_GATE_BIT + 1) |