Merge tag 'renesas-defconfig2-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel...

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 <olof@lixom.net>

diff --cc arch/arm/configs/multi_v7_defconfig
index a992c510723c005f5cb696a1ed808c2b232b2fad,a5c6ebf39b0abab572ebc456b0fc8abf1f2cadca..d3fc04007cf5d4e4b9f01fcdf088abde2d6336f7
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/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