Commit 3139c907 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'renesas-defconfig2-for-v4.2' of...

Merge tag 'renesas-defconfig2-for-v4.2' of git://git.kernel.org/pub/scm/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
parents a5c0afd8 f2a5cefb
...@@ -76,6 +76,7 @@ CONFIG_ARCH_EMEV2=y ...@@ -76,6 +76,7 @@ CONFIG_ARCH_EMEV2=y
CONFIG_ARCH_R7S72100=y CONFIG_ARCH_R7S72100=y
CONFIG_ARCH_R8A73A4=y CONFIG_ARCH_R8A73A4=y
CONFIG_ARCH_R8A7740=y CONFIG_ARCH_R8A7740=y
CONFIG_ARCH_R8A7778=y
CONFIG_ARCH_R8A7779=y CONFIG_ARCH_R8A7779=y
CONFIG_ARCH_R8A7790=y CONFIG_ARCH_R8A7790=y
CONFIG_ARCH_R8A7791=y CONFIG_ARCH_R8A7791=y
...@@ -426,6 +427,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y ...@@ -426,6 +427,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_RENESAS_VSP1=m CONFIG_VIDEO_RENESAS_VSP1=m
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_VIDEO_ADV7180=m CONFIG_VIDEO_ADV7180=m
CONFIG_VIDEO_ML86V7667=m
CONFIG_DRM=y CONFIG_DRM=y
CONFIG_DRM_PTN3460=m CONFIG_DRM_PTN3460=m
CONFIG_DRM_PS8622=m CONFIG_DRM_PS8622=m
...@@ -553,6 +555,7 @@ CONFIG_RTC_DRV_TWL4030=y ...@@ -553,6 +555,7 @@ CONFIG_RTC_DRV_TWL4030=y
CONFIG_RTC_DRV_TPS6586X=y CONFIG_RTC_DRV_TPS6586X=y
CONFIG_RTC_DRV_TPS65910=y CONFIG_RTC_DRV_TPS65910=y
CONFIG_RTC_DRV_S35390A=m CONFIG_RTC_DRV_S35390A=m
CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_EM3027=y CONFIG_RTC_DRV_EM3027=y
CONFIG_RTC_DRV_DIGICOLOR=m CONFIG_RTC_DRV_DIGICOLOR=m
CONFIG_RTC_DRV_S5M=m CONFIG_RTC_DRV_S5M=m
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment