Commit 815d469d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux 

Pull more clk framework updates from Stephen Boyd:
 "One more patch to remove io.h from clk-provider.h.

  We used to need this include when we had clk_readl() and clk_writel(),
  but those are gone now so this patch pushes the dependency out to the
  users of clk-provider.h"

* tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: Remove io.h from clk-provider.h
parents 5f3ab27b 62e59c4e

arch/arm/mach-davinci/da830.c

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

#include <linux/gpio.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/irqchip/irq-davinci-cp-intc.h>

#include <linux/platform_data/gpio-davinci.h>

arch/arm/mach-davinci/da850.c

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

#include <linux/gpio.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/irqchip/irq-davinci-cp-intc.h>

#include <linux/mfd/da8xx-cfgchip.h>

#include <linux/platform_data/clk-da8xx-cfgchip.h>

arch/arm/mach-davinci/devices-da8xx.c

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

#include <linux/dmaengine.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/platform_device.h>

#include <linux/reboot.h>

#include <linux/serial_8250.h>

arch/arm/mach-davinci/dm355.c

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

#include <linux/dmaengine.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/irqchip/irq-davinci-aintc.h>

#include <linux/platform_data/edma.h>

#include <linux/platform_data/gpio-davinci.h>

arch/arm/mach-davinci/dm365.c

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

#include <linux/dmaengine.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/irqchip/irq-davinci-aintc.h>

#include <linux/platform_data/edma.h>

#include <linux/platform_data/gpio-davinci.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE