OSDN Git Service

Merge branch 'cleanup-clk-h-includes' into clk-next
authorStephen Boyd <sboyd@codeaurora.org>
Tue, 21 Jul 2015 18:22:42 +0000 (11:22 -0700)
committerStephen Boyd <sboyd@codeaurora.org>
Tue, 28 Jul 2015 18:59:09 +0000 (11:59 -0700)
commit9cfad9bc472a4bdd5ee7d9e713113a9f5a676704
treecd9b055e0859e83676c0b6cb98b9cb3e53ad95f2
parent9da9e761273702b3afd6e3538c23ece95693e586
parent61ae76563ec3b506235d5dd69c6fdacea321254d
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
  ...
31 files changed:
arch/arm/mach-omap2/clock.c
arch/mips/alchemy/common/clock.c
drivers/clk/at91/clk-slow.c
drivers/clk/bcm/clk-kona.c
drivers/clk/clk-twl6040.c
drivers/clk/clk.c
drivers/clk/h8300/clk-div.c
drivers/clk/h8300/clk-h8s2678.c
drivers/clk/hisilicon/clk-hi3620.c
drivers/clk/keystone/pll.c
drivers/clk/mediatek/clk-mt8173.c
drivers/clk/mediatek/clk-mtk.h
drivers/clk/qcom/mmcc-msm8960.c
drivers/clk/rockchip/clk-mmc-phase.c
drivers/clk/rockchip/clk-rk3188.c
drivers/clk/rockchip/clk.h
drivers/clk/st/clk-flexgen.c
drivers/clk/st/clkgen-fsyn.c
drivers/clk/st/clkgen-mux.c
drivers/clk/st/clkgen-pll.c
drivers/clk/sunxi/clk-sunxi.c
drivers/clk/ti/apll.c
drivers/clk/ti/clk-2xxx.c
drivers/clk/ti/clk-33xx.c
drivers/clk/ti/clk-3xxx.c
drivers/clk/ti/clk-43xx.c
drivers/clk/ti/clk.c
drivers/clk/ti/clockdomain.c
drivers/clk/ti/dpll.c
drivers/clk/ti/fapll.c
include/linux/clk-provider.h