On 07/19/2018 09:44 AM, Simon Horman wrote: > On Wed, Jul 18, 2018 at 03:31:12PM +0200, Jacopo Mondi wrote: >> As the soc_camera framework is going to be deprecated soon, remove the >> associated configuration options from shmobile defconfig. >> >> Signed-off-by: Jacopo Mondi <jacopo@xxxxxxxxxx> >> --- >> Hi Simon, >> I expect Hans to collect this patch as he did for SH defconfig ones. >> Please let us know if that's not ok with you. > > I'd slightly prefer if shmobile_defconfig changes went through me. > My motivation is to reduce the chances of merge conflicts. Feel free to take it! Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx> Regards, Hans > >> >> Thanks >> j >> --- >> >> arch/arm/configs/shmobile_defconfig | 2 -- >> 1 file changed, 2 deletions(-) >> >> diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig >> index b49887e..239f2c7 100644 >> --- a/arch/arm/configs/shmobile_defconfig >> +++ b/arch/arm/configs/shmobile_defconfig >> @@ -141,8 +141,6 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y >> CONFIG_MEDIA_CONTROLLER=y >> CONFIG_VIDEO_V4L2_SUBDEV_API=y >> CONFIG_V4L_PLATFORM_DRIVERS=y >> -CONFIG_SOC_CAMERA=y >> -CONFIG_SOC_CAMERA_PLATFORM=y >> CONFIG_VIDEO_RCAR_VIN=y >> CONFIG_V4L_MEM2MEM_DRIVERS=y >> CONFIG_VIDEO_RENESAS_JPU=y >> -- >> 2.7.4 >>