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

Commit 2941895a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-defconfig-4.8-2' of... 

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

Samsung defconfig update for v4.8, part 2:
1. Enable Virtual Video Test Driver on nulti_v7 and exynos defconfigs.
   Useful for testing.

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

:
  ARM: multi_v7_defconfig: Enable vivid driver as a module
  ARM: exynos_defconfig: Enable vivid driver as a module

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 01ba96df 06506924

arch/arm/configs/exynos_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -151,6 +151,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_V4L_TEST_DRIVERS=y

CONFIG_DRM=y

CONFIG_DRM_EXYNOS=y

CONFIG_DRM_EXYNOS_FIMD=y
@@ -262,3 +263,4 @@ CONFIG_CRYPTO_AES_ARM_BS=m 
CONFIG_CRC_CCITT=y

CONFIG_FONTS=y

CONFIG_FONT_7x14=y

CONFIG_VIDEO_VIVID=m

arch/arm/configs/multi_v7_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m 
CONFIG_VIDEO_SAMSUNG_S5P_MFC=m

CONFIG_VIDEO_RENESAS_JPU=m

CONFIG_VIDEO_RENESAS_VSP1=m

CONFIG_V4L_TEST_DRIVERS=y

# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set

CONFIG_VIDEO_ADV7180=m

CONFIG_VIDEO_ML86V7667=m
@@ -903,6 +904,7 @@ CONFIG_CRYPTO_GHASH_ARM_CE=m 
CONFIG_CRYPTO_DEV_ATMEL_AES=m

CONFIG_CRYPTO_DEV_ATMEL_TDES=m

CONFIG_CRYPTO_DEV_ATMEL_SHA=m

CONFIG_VIDEO_VIVID=m

CONFIG_VIRTIO=y

CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO_PCI_LEGACY=y