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 /drivers/mailbox | |
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 'drivers/mailbox')
-rw-r--r-- | drivers/mailbox/mtk-cmdq-mailbox.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c index 22811784dc7d..00d5219094e5 100644 --- a/drivers/mailbox/mtk-cmdq-mailbox.c +++ b/drivers/mailbox/mtk-cmdq-mailbox.c @@ -8,6 +8,7 @@ #include <linux/dma-mapping.h> #include <linux/errno.h> #include <linux/interrupt.h> +#include <linux/io.h> #include <linux/iopoll.h> #include <linux/kernel.h> #include <linux/module.h> |