diff options
author | Linus Torvalds | 2019-05-16 19:05:35 -0700 |
---|---|---|
committer | Linus Torvalds | 2019-05-16 19:05:35 -0700 |
commit | 815d469d8c9a3360ee0a8b7857dd95352a6c7bde (patch) | |
tree | 14c3c910fe28855fc2e56882dce569699b2e520b /arch/h8300 | |
parent | 5f3ab27b9eb7f1b97e6d4460ac4e494588e09f0c (diff) | |
parent | 62e59c4e69b3cdbad67e3c2d49e4df4cfe1679e3 (diff) |
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/h8300')
-rw-r--r-- | arch/h8300/kernel/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c index b32bfa1fe99e..23a979a85f14 100644 --- a/arch/h8300/kernel/setup.c +++ b/arch/h8300/kernel/setup.c @@ -13,6 +13,7 @@ #include <linux/sched.h> #include <linux/delay.h> #include <linux/interrupt.h> +#include <linux/io.h> #include <linux/mm.h> #include <linux/fs.h> #include <linux/console.h> |