From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 29 May 2015 14:45:31 +0000 (+0200)
Subject: Merge tag 'renesas-defconfig2-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3139c907dbc2f20b3d06033115b89ae3c5cdd722;p=deliverable%2Flinux.git

Merge tag 'renesas-defconfig2-for-v4.2' of git://git./linux/kernel/git/horms/renesas into next/defconfig

Merge "Second Round of Renesas ARM Based SoC Defconfig Updates for v4.2" from Simon Horman:

* Enable shmobile r8a7778/bockw platform

* tag 'renesas-defconfig2-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: multi_v7_defconfig: Enable shmobile r8a7778/bockw platform
---

3139c907dbc2f20b3d06033115b89ae3c5cdd722
diff --cc arch/arm/configs/multi_v7_defconfig
index 164f2cd817bf,06e7e887fea5..d492a7bb2b0a
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -426,12 -388,8 +427,13 @@@ CONFIG_V4L_MEM2MEM_DRIVERS=
  CONFIG_VIDEO_RENESAS_VSP1=m
  # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
  CONFIG_VIDEO_ADV7180=m
+ CONFIG_VIDEO_ML86V7667=m
  CONFIG_DRM=y
 +CONFIG_DRM_PTN3460=m
 +CONFIG_DRM_PS8622=m
 +CONFIG_DRM_EXYNOS=m
 +CONFIG_DRM_EXYNOS_FIMD=y
 +CONFIG_DRM_EXYNOS_HDMI=y
  CONFIG_DRM_RCAR_DU=m
  CONFIG_DRM_TEGRA=y
  CONFIG_DRM_PANEL_SIMPLE=y
@@@ -553,13 -505,9 +555,14 @@@ CONFIG_RTC_DRV_TWL4030=
  CONFIG_RTC_DRV_TPS6586X=y
  CONFIG_RTC_DRV_TPS65910=y
  CONFIG_RTC_DRV_S35390A=m
+ CONFIG_RTC_DRV_RX8581=m
  CONFIG_RTC_DRV_EM3027=y
 +CONFIG_RTC_DRV_DIGICOLOR=m
 +CONFIG_RTC_DRV_S5M=m
 +CONFIG_RTC_DRV_S3C=m
  CONFIG_RTC_DRV_PL031=y
 +CONFIG_RTC_DRV_AT91RM9200=m
 +CONFIG_RTC_DRV_AT91SAM9=m
  CONFIG_RTC_DRV_VT8500=y
  CONFIG_RTC_DRV_SUN6I=y
  CONFIG_RTC_DRV_SUNXI=y