2 files changed, 1 insertions, 4 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
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 903f23c309df..01b1bdb4fb6e 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -21,7 +21,6 @@ config SOC_SAMA5D2
         depends on ARCH_MULTI_V7
         select SOC_SAMA5
         select CACHE_L2X0
-        select HAVE_FB_ATMEL
         select HAVE_AT91_UTMI
         select HAVE_AT91_USB_CLK
         select HAVE_AT91_H32MX
@@ -36,7 +35,6 @@ config SOC_SAMA5D3
         bool "SAMA5D3 family"
         depends on ARCH_MULTI_V7
         select SOC_SAMA5
-        select HAVE_FB_ATMEL
         select HAVE_AT91_UTMI
         select HAVE_AT91_SMD
         select HAVE_AT91_USB_CLK
@@ -50,7 +48,6 @@ config SOC_SAMA5D4
         depends on ARCH_MULTI_V7
         select SOC_SAMA5
         select CACHE_L2X0
-        select HAVE_FB_ATMEL
         select HAVE_AT91_UTMI
         select HAVE_AT91_SMD
         select HAVE_AT91_USB_CLK