From: Olof Johansson Date: Thu, 22 Oct 2015 16:46:49 +0000 (-0700) Subject: Merge tag 'renesas-defconfig2-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v4.4-rc1~50^2~8 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/c2c73aa8593b9996b9b6f85daf21956c7d655fb6 Merge tag 'renesas-defconfig2-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig Second Round of Renesas ARM Based SoC Defconfig Updates for v4.4 * Enable HDMI output for Renesas RCar * tag 'renesas-defconfig2-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: multi_v7_defconfig: enable HDMI output for Renesas RCar ARM: shmobile: defconfig: enable HDMI output for RCar Signed-off-by: Olof Johansson --- c2c73aa8593b9996b9b6f85daf21956c7d655fb6 diff --cc arch/arm/configs/multi_v7_defconfig index a992c510723c,a5c6ebf39b0a..d3fc04007cf5 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@@ -464,9 -450,9 +465,11 @@@ CONFIG_DRM_EXYNOS= CONFIG_DRM_EXYNOS_DSI=y CONFIG_DRM_EXYNOS_FIMD=y CONFIG_DRM_EXYNOS_HDMI=y +CONFIG_DRM_ROCKCHIP=m +CONFIG_ROCKCHIP_DW_HDMI=m CONFIG_DRM_RCAR_DU=m + CONFIG_DRM_RCAR_HDMI=y + CONFIG_DRM_RCAR_LVDS=y CONFIG_DRM_TEGRA=y CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m CONFIG_DRM_PANEL_SIMPLE=y