aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-05-29 08:06:15 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2017-05-29 08:06:15 +1000
commit44946c4e30bd0d2ad7f497efb5970fce4d41ca61 (patch)
treeb1d3d1104911d363a3cc440b6459ea4a6c806253 /drivers
parentdeb5d567f3233c2bdd057a70f381a68954e0b0ea (diff)
parent428c917deaaf186fb8eb52335a040899675e8099 (diff)
Merge remote-tracking branch 'imx-mxs/for-next'
Diffstat (limited to 'drivers')
-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