Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cfad9bc authored by Stephen Boyd's avatar Stephen Boyd
Browse files

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
  ...
parents 9da9e761 61ae7656

arch/arm/mach-at91/at91rm9200.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
 * Licensed under GPLv2 or later.

 */



#include <linux/clk-provider.h>

#include <linux/of.h>

#include <linux/of_platform.h>

arch/arm/mach-hisi/hisilicon.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
 * published by the Free Software Foundation.

*/



#include <linux/clk-provider.h>

#include <linux/clocksource.h>

#include <linux/irqchip.h>

arch/arm/mach-keystone/pm_domain.c

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/pm_runtime.h>

#include <linux/pm_clock.h>

#include <linux/platform_device.h>

#include <linux/clk-provider.h>

#include <linux/of.h>



static struct dev_pm_domain keystone_pm_domain = {

arch/arm/mach-mvebu/board-v7.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/clk-provider.h>

#include <linux/of_address.h>

#include <linux/of_fdt.h>

#include <linux/of_platform.h>

arch/arm/mach-omap2/clock.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/errno.h>

#include <linux/err.h>

#include <linux/delay.h>

#include <linux/clk.h>

#include <linux/clk-provider.h>

#include <linux/io.h>

#include <linux/bitops.h>