summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorFabio Estevam2012-10-07 19:44:17 +0200
committerSascha Hauer2012-10-10 10:51:00 +0200
commit5177ae56d1b6dcf4b23f1f89ed3be1c3dc0ad513 (patch)
tree8678b93c0fe04a4f2b5108c586fecfaf7085c8fe /arch/arm/configs
parentARM: imx_v6_v7_defconfig: Add DA9052 regulator support (diff)
downloadkernel-qcow2-linux-5177ae56d1b6dcf4b23f1f89ed3be1c3dc0ad513.tar.gz
kernel-qcow2-linux-5177ae56d1b6dcf4b23f1f89ed3be1c3dc0ad513.tar.xz
kernel-qcow2-linux-5177ae56d1b6dcf4b23f1f89ed3be1c3dc0ad513.zip
ARM: imx: configs: Enable CONFIG_MEDIA_CAMERA_SUPPORT
Since commit b4c184e5 (edia] media: reorganize the main Kconfig items), it is necessary to select CONFIG_MEDIA_CAMERA_SUPPORT in order to be able to use the SoC camera drivers. Select CONFIG_MEDIA_CAMERA_SUPPORT so that we can use mx2-camera/mx3-camera by default as previously. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/imx_v4_v5_defconfig1
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index 78ed575feb1a..d10040108249 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -121,6 +121,7 @@ CONFIG_REGULATOR_MC13892=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_VIDEO_DEV=y
CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_SOC_CAMERA=y
CONFIG_SOC_CAMERA_OV2640=y
CONFIG_VIDEO_MX2=y
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 56beb14a7735..7ea6bde94aab 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -156,6 +156,7 @@ CONFIG_REGULATOR_MC13892=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_VIDEO_DEV=y
CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_SOC_CAMERA=y
CONFIG_SOC_CAMERA_OV2640=y
CONFIG_VIDEO_MX3=y