Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f871da0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-defconfig-4.10' of... 

Merge tag 'samsung-defconfig-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig

Samsung defconfig update for v4.10:
1. Enable the Exynos gscaler driver on multi_v7 and exynos defconfigs.

* tag 'samsung-defconfig-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: multi_v7_defconfig: Enable exynos-gsc driver as module
  ARM: exynos_defconfig: Enable exynos-gsc driver as module

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ca16c9c8 e471e9b4

arch/arm/configs/exynos_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ CONFIG_VIDEO_EXYNOS4_FIMC_IS=m 
CONFIG_V4L_MEM2MEM_DRIVERS=y

CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m

CONFIG_VIDEO_SAMSUNG_S5P_MFC=m

CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m

CONFIG_V4L_TEST_DRIVERS=y

CONFIG_DRM=y

CONFIG_DRM_EXYNOS=y

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -561,6 +561,7 @@ CONFIG_VIDEO_EXYNOS4_FIMC_IS=m 
CONFIG_V4L_MEM2MEM_DRIVERS=y

CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m

CONFIG_VIDEO_SAMSUNG_S5P_MFC=m

CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m

CONFIG_VIDEO_STI_BDISP=m

CONFIG_VIDEO_RENESAS_JPU=m

CONFIG_VIDEO_RENESAS_VSP1=m