diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-16 19:05:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-16 19:05:35 -0700 |
| commit | 815d469d8c9a3360ee0a8b7857dd95352a6c7bde (patch) | |
| tree | 14c3c910fe28855fc2e56882dce569699b2e520b /arch/mips | |
| parent | 5f3ab27b9eb7f1b97e6d4460ac4e494588e09f0c (diff) | |
| parent | 62e59c4e69b3cdbad67e3c2d49e4df4cfe1679e3 (diff) | |
| download | linux-815d469d8c9a3360ee0a8b7857dd95352a6c7bde.tar.bz2 | |
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
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/ath79/clock.c | 1 | ||||
| -rw-r--r-- | arch/mips/ath79/setup.c | 1 | ||||
| -rw-r--r-- | arch/mips/txx9/generic/setup.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c index d4ca97e2ec6c..228cdc736db7 100644 --- a/arch/mips/ath79/clock.c +++ b/arch/mips/ath79/clock.c @@ -13,6 +13,7 @@ #include <linux/kernel.h> #include <linux/init.h> +#include <linux/io.h> #include <linux/err.h> #include <linux/clk.h> #include <linux/clkdev.h> diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c index 25a57895a3a3..298b46b4e9cb 100644 --- a/arch/mips/ath79/setup.c +++ b/arch/mips/ath79/setup.c @@ -14,6 +14,7 @@ #include <linux/kernel.h> #include <linux/init.h> +#include <linux/io.h> #include <linux/memblock.h> #include <linux/err.h> #include <linux/clk.h> diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c index 70a1ab66d252..46537c2ca86a 100644 --- a/arch/mips/txx9/generic/setup.c +++ b/arch/mips/txx9/generic/setup.c @@ -26,6 +26,7 @@ #include <linux/leds.h> #include <linux/device.h> #include <linux/slab.h> +#include <linux/io.h> #include <linux/irq.h> #include <asm/bootinfo.h> #include <asm/idle.h> |