Skip to content

Commit 815d469

Browse files
committed
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
2 parents 5f3ab27 + 62e59c4 commit 815d469

File tree

153 files changed

+158
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+158
-7
lines changed

arch/arm/mach-davinci/da830.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <linux/clk/davinci.h>
1313
#include <linux/gpio.h>
1414
#include <linux/init.h>
15+
#include <linux/io.h>
1516
#include <linux/irqchip/irq-davinci-cp-intc.h>
1617
#include <linux/platform_data/gpio-davinci.h>
1718

arch/arm/mach-davinci/da850.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <linux/cpufreq.h>
1919
#include <linux/gpio.h>
2020
#include <linux/init.h>
21+
#include <linux/io.h>
2122
#include <linux/irqchip/irq-davinci-cp-intc.h>
2223
#include <linux/mfd/da8xx-cfgchip.h>
2324
#include <linux/platform_data/clk-da8xx-cfgchip.h>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/dma-contiguous.h>
1818
#include <linux/dmaengine.h>
1919
#include <linux/init.h>
20+
#include <linux/io.h>
2021
#include <linux/platform_device.h>
2122
#include <linux/reboot.h>
2223
#include <linux/serial_8250.h>

arch/arm/mach-davinci/dm355.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/dma-mapping.h>
1616
#include <linux/dmaengine.h>
1717
#include <linux/init.h>
18+
#include <linux/io.h>
1819
#include <linux/irqchip/irq-davinci-aintc.h>
1920
#include <linux/platform_data/edma.h>
2021
#include <linux/platform_data/gpio-davinci.h>

arch/arm/mach-davinci/dm365.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <linux/dma-mapping.h>
2020
#include <linux/dmaengine.h>
2121
#include <linux/init.h>
22+
#include <linux/io.h>
2223
#include <linux/irqchip/irq-davinci-aintc.h>
2324
#include <linux/platform_data/edma.h>
2425
#include <linux/platform_data/gpio-davinci.h>

arch/arm/mach-davinci/dm644x.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/clkdev.h>
1515
#include <linux/dmaengine.h>
1616
#include <linux/init.h>
17+
#include <linux/io.h>
1718
#include <linux/irqchip/irq-davinci-aintc.h>
1819
#include <linux/platform_data/edma.h>
1920
#include <linux/platform_data/gpio-davinci.h>

arch/arm/mach-davinci/dm646x.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/dma-mapping.h>
1616
#include <linux/dmaengine.h>
1717
#include <linux/init.h>
18+
#include <linux/io.h>
1819
#include <linux/irqchip/irq-davinci-aintc.h>
1920
#include <linux/platform_data/edma.h>
2021
#include <linux/platform_data/gpio-davinci.h>

arch/arm/mach-dove/common.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/clk-provider.h>
1212
#include <linux/dma-mapping.h>
1313
#include <linux/init.h>
14+
#include <linux/io.h>
1415
#include <linux/of.h>
1516
#include <linux/of_platform.h>
1617
#include <linux/platform_data/dma-mv_xor.h>

arch/arm/mach-mediatek/mediatek.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* GNU General Public License for more details.
1616
*/
1717
#include <linux/init.h>
18+
#include <linux/io.h>
1819
#include <asm/mach/arch.h>
1920
#include <linux/of.h>
2021
#include <linux/clk-provider.h>

arch/arm/mach-mv78xx0/common.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <linux/kernel.h>
1212
#include <linux/init.h>
13+
#include <linux/io.h>
1314
#include <linux/platform_device.h>
1415
#include <linux/serial_8250.h>
1516
#include <linux/ata_platform.h>

0 commit comments

Comments
 (0)