aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/multi_v7_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 29729448b9dc..95e1157f6e18 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -542,6 +542,7 @@ CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
542CONFIG_VIDEO_SAMSUNG_S5P_MFC=m 542CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
543CONFIG_VIDEO_RENESAS_JPU=m 543CONFIG_VIDEO_RENESAS_JPU=m
544CONFIG_VIDEO_RENESAS_VSP1=m 544CONFIG_VIDEO_RENESAS_VSP1=m
545CONFIG_V4L_TEST_DRIVERS=y
545# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set 546# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
546CONFIG_VIDEO_ADV7180=m 547CONFIG_VIDEO_ADV7180=m
547CONFIG_VIDEO_ML86V7667=m 548CONFIG_VIDEO_ML86V7667=m
@@ -890,6 +891,7 @@ CONFIG_CRYPTO_GHASH_ARM_CE=m
890CONFIG_CRYPTO_DEV_ATMEL_AES=m 891CONFIG_CRYPTO_DEV_ATMEL_AES=m
891CONFIG_CRYPTO_DEV_ATMEL_TDES=m 892CONFIG_CRYPTO_DEV_ATMEL_TDES=m
892CONFIG_CRYPTO_DEV_ATMEL_SHA=m 893CONFIG_CRYPTO_DEV_ATMEL_SHA=m
894CONFIG_VIDEO_VIVID=m
893CONFIG_VIRTIO=y 895CONFIG_VIRTIO=y
894CONFIG_VIRTIO_PCI=y 896CONFIG_VIRTIO_PCI=y
895CONFIG_VIRTIO_PCI_LEGACY=y 897CONFIG_VIRTIO_PCI_LEGACY=y