summaryrefslogtreecommitdiffstats
path: root/drivers/memory/tegra
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-05-17 04:05:35 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2019-05-17 04:05:35 +0200
commit815d469d8c9a3360ee0a8b7857dd95352a6c7bde (patch)
tree14c3c910fe28855fc2e56882dce569699b2e520b /drivers/memory/tegra
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)
downloadlinux-815d469d8c9a3360ee0a8b7857dd95352a6c7bde.tar.xz
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/memory/tegra')
-rw-r--r--drivers/memory/tegra/tegra124-emc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/memory/tegra/tegra124-emc.c b/drivers/memory/tegra/tegra124-emc.c
index eedb7d48e2ea..772716ab6b23 100644
--- a/drivers/memory/tegra/tegra124-emc.c
+++ b/drivers/memory/tegra/tegra124-emc.c
@@ -20,6 +20,7 @@
#include <linux/clkdev.h>
#include <linux/debugfs.h>
#include <linux/delay.h>
+#include <linux/io.h>
#include <linux/of_address.h>
#include <linux/of_platform.h>
#include <linux/platform_device.h>