summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOlof Johansson2019-05-16 19:59:33 +0200
committerOlof Johansson2019-05-16 19:59:33 +0200
commite40b0695d56df51ae4d4fe4f60b6c61d123dc7bb (patch)
tree5631b4a8eb67b81c5bbe557c0e74c9289d2d5484 /arch/arm/configs
parentMerge tag 'tegra-for-5.2-arm64-dt-fixes' of git://git.kernel.org/pub/scm/linu... (diff)
parentARM: at91: sama5: make ov2640 as a module (diff)
downloadkernel-qcow2-linux-e40b0695d56df51ae4d4fe4f60b6c61d123dc7bb.tar.gz
kernel-qcow2-linux-e40b0695d56df51ae4d4fe4f60b6c61d123dc7bb.tar.xz
kernel-qcow2-linux-e40b0695d56df51ae4d4fe4f60b6c61d123dc7bb.zip
Merge tag 'at91-5.2-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/late
AT91 defconfig for 5.2 - ov2640 driver as module - selecting HAVE_FB_ATMEL for SAMA5 SoCs is useless * tag 'at91-5.2-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: at91: sama5: make ov2640 as a module ARM: at91: remove HAVE_FB_ATMEL for sama5 SoC as they use DRM Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/sama5_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
index 515cb37eeab6..d5341b0bd88d 100644
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@ -150,7 +150,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_SOC_CAMERA=y
CONFIG_VIDEO_ATMEL_ISI=y
-CONFIG_SOC_CAMERA_OV2640=y
+CONFIG_SOC_CAMERA_OV2640=m
CONFIG_DRM=y
CONFIG_DRM_ATMEL_HLCDC=y
CONFIG_DRM_PANEL_SIMPLE=y