summaryrefslogtreecommitdiffstats
path: root/drivers/soc
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-06-18 23:05:10 -0700
committerOlof Johansson <olof@lixom.net>2017-06-18 23:05:10 -0700
commit2f1b526e83a618521a00618e4b8986dd3ade0b8d (patch)
tree6dd796eb3e1f6732d8e12d1306a8e9ebf914dd73 /drivers/soc
parenta32e6a353dac8641dcdc25854d2c64134839c07f (diff)
parentc465a32fdde67c029ba8880f2878491042b72524 (diff)
downloadlinux-2f1b526e83a618521a00618e4b8986dd3ade0b8d.tar.bz2
Merge tag 'imx-drivers-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/drivers
The i.MX drivers update for 4.13: - Add CONFIG_HAVE_IMX_GPC to control the build of GPC driver, so that it doesn't build for platforms that do not have it. * tag 'imx-drivers-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: soc: imx: gpc: build gpc only if hardware has gpc Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/imx/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/imx/Makefile b/drivers/soc/imx/Makefile
index 5b6e396c1121..aab41a5cc317 100644
--- a/drivers/soc/imx/Makefile
+++ b/drivers/soc/imx/Makefile
@@ -1,2 +1,2 @@
-obj-y += gpc.o
+obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o
obj-$(CONFIG_IMX7_PM_DOMAINS) += gpcv2.o