summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorLinus Torvalds2019-05-17 04:05:35 +0200
committerLinus Torvalds2019-05-17 04:05:35 +0200
commit815d469d8c9a3360ee0a8b7857dd95352a6c7bde (patch)
tree14c3c910fe28855fc2e56882dce569699b2e520b /drivers/mfd
parentMerge branch 'for-5.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentclk: Remove io.h from clk-provider.h (diff)
downloadkernel-qcow2-linux-815d469d8c9a3360ee0a8b7857dd95352a6c7bde.tar.gz
kernel-qcow2-linux-815d469d8c9a3360ee0a8b7857dd95352a6c7bde.tar.xz
kernel-qcow2-linux-815d469d8c9a3360ee0a8b7857dd95352a6c7bde.zip
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/mfd')
-rw-r--r--drivers/mfd/intel-lpss.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c
index 7e425ff53491..fc6aa4c50144 100644
--- a/drivers/mfd/intel-lpss.c
+++ b/drivers/mfd/intel-lpss.c
@@ -18,6 +18,7 @@
#include <linux/clk-provider.h>
#include <linux/debugfs.h>
#include <linux/idr.h>
+#include <linux/io.h>
#include <linux/ioport.h>
#include <linux/kernel.h>
#include <linux/module.h>