From: Olof Johansson Date: Mon, 19 Jun 2017 05:45:08 +0000 (-0700) Subject: Merge tag 'renesas-drivers-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8c5c25067044b7bcb2201e761483ef4cacc970d8;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'renesas-drivers-for-v4.13' of https://git./linux/kernel/git/horms/renesas into next/drivers Renesas ARM Based SoC Drivers Updates for v4.13 * Rework Kconfig and Makefile logic * tag 'renesas-drivers-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: soc: renesas: Rework Kconfig and Makefile logic Signed-off-by: Olof Johansson --- 8c5c25067044b7bcb2201e761483ef4cacc970d8 diff --cc drivers/soc/Kconfig index 309643fe35f9,de4fcdbae2a8..f8c0286f8a65 --- a/drivers/soc/Kconfig +++ b/drivers/soc/Kconfig @@@ -1,11 -1,10 +1,12 @@@ menu "SOC (System On Chip) specific Drivers" +source "drivers/soc/atmel/Kconfig" source "drivers/soc/bcm/Kconfig" source "drivers/soc/fsl/Kconfig" +source "drivers/soc/imx/Kconfig" source "drivers/soc/mediatek/Kconfig" source "drivers/soc/qcom/Kconfig" + source "drivers/soc/renesas/Kconfig" source "drivers/soc/rockchip/Kconfig" source "drivers/soc/samsung/Kconfig" source "drivers/soc/sunxi/Kconfig" diff --cc drivers/soc/Makefile index 824b44281efa,59d8c937f4a8..c0b2a610efcd --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@@ -7,10 -6,9 +7,10 @@@ obj-y += bcm obj-$(CONFIG_ARCH_DOVE) += dove/ obj-$(CONFIG_MACH_DOVE) += dove/ obj-y += fsl/ +obj-$(CONFIG_ARCH_MXC) += imx/ obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/ obj-$(CONFIG_ARCH_QCOM) += qcom/ - obj-$(CONFIG_ARCH_RENESAS) += renesas/ + obj-y += renesas/ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ obj-$(CONFIG_SOC_SAMSUNG) += samsung/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/