diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-21 20:22:42 +0200 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-28 20:59:09 +0200 |
| commit | 9cfad9bc472a4bdd5ee7d9e713113a9f5a676704 (patch) | |
| tree | cd9b055e0859e83676c0b6cb98b9cb3e53ad95f2 /drivers/clk/sunxi/clk-usb.c | |
| parent | clk: ti: make use of of_clk_parent_fill helper function (diff) | |
| parent | clk: Remove clk.h from clk-provider.h (diff) | |
| download | linux-9cfad9bc472a4bdd5ee7d9e713113a9f5a676704.tar.xz 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/sunxi/clk-usb.c')
| -rw-r--r-- | drivers/clk/sunxi/clk-usb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/sunxi/clk-usb.c b/drivers/clk/sunxi/clk-usb.c index 3a25f9588e67..1a72cd672839 100644 --- a/drivers/clk/sunxi/clk-usb.c +++ b/drivers/clk/sunxi/clk-usb.c @@ -14,11 +14,12 @@ * GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> -#include <linux/clkdev.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/reset-controller.h> +#include <linux/slab.h> #include <linux/spinlock.h> |