summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/Makefile
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-11-14 12:35:47 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2016-11-14 12:35:47 +0100
commit6b00efcb0fa1284741ef1d92a990409519f8fb28 (patch)
tree0831866e0c50c0c5ca0917b1c1c660e43e2334d0 /arch/arm/mach-imx/Makefile
parent9bc62894a844650ba0a673b5b4ca96f4989d98d3 (diff)
parent024912ba32bccb931e994e8929839751fce9097e (diff)
downloadbarebox-6b00efcb0fa1284741ef1d92a990409519f8fb28.tar.gz
barebox-6b00efcb0fa1284741ef1d92a990409519f8fb28.tar.xz
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/mach-imx/Makefile')
-rw-r--r--arch/arm/mach-imx/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index a216c9bb07..1f1a099209 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -14,6 +14,7 @@ pbl-$(CONFIG_ARCH_IMX53) += imx53.o imx5.o esdctl-v4.o
obj-$(CONFIG_ARCH_IMX6) += imx6.o usb-imx6.o clk-imx6.o
lwl-$(CONFIG_ARCH_IMX6) += imx6-mmdc.o
obj-$(CONFIG_ARCH_IMX6SX) += clk-imx6sx.o
+obj-$(CONFIG_ARCH_IMX6UL) += clk-imx6ul.o
obj-$(CONFIG_ARCH_IMX_XLOAD) += xload.o
obj-$(CONFIG_IMX_IIM) += iim.o
obj-$(CONFIG_IMX_OCOTP) += ocotp.o