From: Maxime Jourdan Date: Mon, 12 Nov 2018 16:46:54 +0000 (+0100) Subject: drivers: soc: Allow building the amlogic drivers without ARCH_MESON X-Git-Tag: v4.19.89~199 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed973f15f445352cd92efadfa47135c237561b5e;p=thirdparty%2Fkernel%2Fstable.git drivers: soc: Allow building the amlogic drivers without ARCH_MESON [ Upstream commit 41bb5769b7f4b7a85e4b92c37429228279b4f569 ] The current condition makes it difficult to compile the amlogic/ drivers with COMPILE_TEST, or without ARCH_MESON in general. Fixes kbuild errors with patch series that depend on drivers in that directory, for instance the meson video decoder. Signed-off-by: Maxime Jourdan Signed-off-by: Kevin Hilman Signed-off-by: Sasha Levin --- diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 113e884697fd8..f0d46b16e08c4 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -13,7 +13,7 @@ obj-$(CONFIG_ARCH_GEMINI) += gemini/ obj-$(CONFIG_ARCH_MXC) += imx/ obj-$(CONFIG_SOC_XWAY) += lantiq/ obj-y += mediatek/ -obj-$(CONFIG_ARCH_MESON) += amlogic/ +obj-y += amlogic/ obj-y += qcom/ obj-y += renesas/ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/