From dd9a841da571a41d43f1eeaac1785b2adb1d80f3 Mon Sep 17 00:00:00 2001 From: Vikram Fugro Date: Wed, 30 Oct 2013 13:23:40 +0530 Subject: media: camera config changes - Disables TEGRA_CAMERA - Enables SOC_CAMERA and OV5640 sensor support Bug 1369083 Change-Id: I073c226e9f04a6f4f4699051f624a755dceb36cb Signed-off-by: Vikram Fugro Reviewed-on: http://git-master/r/309491 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Matthew Pedro --- arch/arm/configs/tegra3_defconfig | 5 ++++- drivers/media/video/tegra/Kconfig | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/tegra3_defconfig b/arch/arm/configs/tegra3_defconfig index 9f212bbad50b..207c5e5771dc 100644 --- a/arch/arm/configs/tegra3_defconfig +++ b/arch/arm/configs/tegra3_defconfig @@ -324,7 +324,10 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y # CONFIG_TEGRA_AVP is not set # CONFIG_TEGRA_MEDIASERVER is not set CONFIG_TEGRA_NVAVP=y -CONFIG_VIDEO_OV5650=m +#CONFIG_VIDEO_OV5650 is not set +CONFIG_SOC_CAMERA=y +CONFIG_VIDEO_TEGRA=y +CONFIG_SOC_CAMERA_OV5640=y CONFIG_VIDEO_OV2710=m CONFIG_TORCH_SSL3250A=m CONFIG_TORCH_TPS61050=m diff --git a/drivers/media/video/tegra/Kconfig b/drivers/media/video/tegra/Kconfig index 5099fe12c3e2..571b49bfd699 100644 --- a/drivers/media/video/tegra/Kconfig +++ b/drivers/media/video/tegra/Kconfig @@ -5,7 +5,6 @@ source "drivers/media/video/tegra/nvavp/Kconfig" config TEGRA_CAMERA bool "Enable support for tegra camera/isp hardware" depends on ARCH_TEGRA - default y help Enables support for the Tegra camera interface -- cgit v1.2.3