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/mfd | |
| 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/mfd')
| -rw-r--r-- | drivers/mfd/intel-lpss.c | 1 |
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> |