Merge branch '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[thirdparty/kernel/stable.git] / drivers / soc / Makefile

diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index f24d95194ced7b4f83ca20623cff2c92d7b5ac5a..2fcaff8645846ca19202306ecc91f5b37c1bf441 100644 (file)
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -11,6 +11,7 @@ obj-y                         += fsl/
 obj-$(CONFIG_ARCH_MXC)         += imx/
 obj-$(CONFIG_SOC_XWAY)         += lantiq/
 obj-$(CONFIG_ARCH_MEDIATEK)    += mediatek/
+obj-$(CONFIG_ARCH_MESON)       += amlogic/
 obj-$(CONFIG_ARCH_QCOM)                += qcom/
 obj-y                          += renesas/
 obj-$(CONFIG_ARCH_ROCKCHIP)    += rockchip/