Merge tag 'at91-5.2-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/at91...

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>

diff --combined arch/arm/configs/sama5_defconfig
index 515cb37,e977e4b..d5341b0
--- 1/arch/arm/configs/sama5_defconfig
--- 2/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@@ -66,7 -66,7 +66,7 @@@ CONFIG_MTD_CMDLINE_PARTS=
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_CFI=y
  CONFIG_MTD_M25P80=y
 -CONFIG_MTD_NAND=y
 +CONFIG_MTD_RAW_NAND=y
  CONFIG_MTD_NAND_ATMEL=y
  CONFIG_MTD_SPI_NOR=y
  CONFIG_MTD_UBI=y
@@@ -150,7 -150,7 +150,7 @@@ CONFIG_MEDIA_CAMERA_SUPPORT=
  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