media: camera config changes
Vikram Fugro [Wed, 30 Oct 2013 07:53:40 +0000 (12:53 +0530)]
- Disables TEGRA_CAMERA
- Enables SOC_CAMERA and OV5640 sensor support

Bug 1369083

Change-Id: I073c226e9f04a6f4f4699051f624a755dceb36cb
Signed-off-by: Vikram Fugro <vfugro@nvidia.com>
Reviewed-on: http://git-master/r/309491
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>

arch/arm/configs/tegra3_defconfig
drivers/media/video/tegra/Kconfig

index 9f212bb..207c5e5 100644 (file)
@@ -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
index 5099fe1..571b49b 100644 (file)
@@ -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