diff options
| author | Tony Lindgren <tony@atomide.com> | 2020-06-16 19:25:03 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-06-16 19:25:03 +0300 |
| commit | 07c7b547a79605f1041d55b84d91a4a4d9c5b363 (patch) | |
| tree | d98c1adacc8c65b475c325b427e54b8205b0013d /arch/arm/configs/multi_v7_defconfig | |
| parent | e4a8fc054340f4df761f6a73335f8fdc0b7ac4fd (diff) | |
| parent | b3a9e3b9622ae10064826dccb4f7a52bd88c7407 (diff) | |
| download | linux-07c7b547a79605f1041d55b84d91a4a4d9c5b363.tar.xz | |
Merge tag 'v5.8-rc1' into fixes
Linux 5.8-rc1
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index f8e45351c3f9..95543914d3c7 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -638,7 +638,7 @@ CONFIG_VIDEO_RENESAS_VSP1=m CONFIG_V4L_TEST_DRIVERS=y CONFIG_VIDEO_VIVID=m CONFIG_CEC_PLATFORM_DRIVERS=y -CONFIG_VIDEO_SAMSUNG_S5P_CEC=m +CONFIG_CEC_SAMSUNG_S5P=m CONFIG_VIDEO_ADV7180=m CONFIG_VIDEO_ML86V7667=m CONFIG_IMX_IPUV3_CORE=m @@ -979,6 +979,7 @@ CONFIG_ARCH_R7S72100=y CONFIG_ARCH_R7S9210=y CONFIG_ARCH_R8A73A4=y CONFIG_ARCH_R8A7740=y +CONFIG_ARCH_R8A7742=y CONFIG_ARCH_R8A7743=y CONFIG_ARCH_R8A7744=y CONFIG_ARCH_R8A7745=y |