Revert "media: camera config changes"
Vikram Fugro [Thu, 7 Nov 2013 09:44:29 +0000 (01:44 -0800)]
This reverts commit dd9a841da571a41d43f1eeaac1785b2adb1d80f3.
The config changes (for V4L2) can be done manually as per need
basis for V4L2, followed by compiling the kernel.

Change-Id: I9174bce0f3da2974ab703b238dfb8fb3bbf607c5
Signed-off-by: Vikram Fugro <vfugro@nvidia.com>
Reviewed-on: http://git-master/r/327607
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Kaustubh Purandare <kpurandare@nvidia.com>
Reviewed-by: Winnie Hsu <whsu@nvidia.com>
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>

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

index 207c5e5..9f212bb 100644 (file)
@@ -324,10 +324,7 @@ 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 is not set
-CONFIG_SOC_CAMERA=y
-CONFIG_VIDEO_TEGRA=y
-CONFIG_SOC_CAMERA_OV5640=y
+CONFIG_VIDEO_OV5650=m
 CONFIG_VIDEO_OV2710=m
 CONFIG_TORCH_SSL3250A=m
 CONFIG_TORCH_TPS61050=m
index 571b49b..5099fe1 100644 (file)
@@ -5,6 +5,7 @@ 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