summaryrefslogtreecommitdiff
path: root/drivers/soc
diff options
context:
space:
mode:
authorMaxime Jourdan <mjourdan@baylibre.com>2018-11-12 17:46:54 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-13 08:51:22 +0100
commited973f15f445352cd92efadfa47135c237561b5e (patch)
treee284841f7b6c6f1b344c6fbd819b84f6410d5170 /drivers/soc
parent45c2f3f7e1a1e47502b70694d4957f19ec30a9a3 (diff)
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 <mjourdan@baylibre.com> Signed-off-by: Kevin Hilman <khilman@baylibre.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 113e884697fd..f0d46b16e08c 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/