diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-29 16:45:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-29 16:45:31 +0200 |
| commit | 3139c907dbc2f20b3d06033115b89ae3c5cdd722 (patch) | |
| tree | 41c829205f10f00d1b9d3a281582e1ffbdcaddd5 /arch/arm | |
| parent | ARM: lpc18xx: remove DEBUG_LL_UART_8250 from defconfig (diff) | |
| parent | ARM: multi_v7_defconfig: Enable shmobile r8a7778/bockw platform (diff) | |
| download | linux-3139c907dbc2f20b3d06033115b89ae3c5cdd722.tar.xz linux-3139c907dbc2f20b3d06033115b89ae3c5cdd722.zip | |
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
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 164f2cd817bf..d492a7bb2b0a 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -76,6 +76,7 @@ CONFIG_ARCH_EMEV2=y CONFIG_ARCH_R7S72100=y CONFIG_ARCH_R8A73A4=y CONFIG_ARCH_R8A7740=y +CONFIG_ARCH_R8A7778=y CONFIG_ARCH_R8A7779=y CONFIG_ARCH_R8A7790=y CONFIG_ARCH_R8A7791=y @@ -426,6 +427,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y 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 @@ -553,6 +555,7 @@ CONFIG_RTC_DRV_TWL4030=y 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 |