diff options
| author | Vikram Fugro <vfugro@nvidia.com> | 2013-11-07 01:44:29 -0800 |
|---|---|---|
| committer | Matthew Pedro <mapedro@nvidia.com> | 2013-11-18 14:12:56 -0800 |
| commit | 2cfae82f4f11691c291c85f9d4ff2ec73ea74e57 (patch) | |
| tree | b45f1c623062eb799ca38167c3114828bb25ab55 | |
| parent | dd9a841da571a41d43f1eeaac1785b2adb1d80f3 (diff) | |
Revert "media: camera config changes"
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>
| -rw-r--r-- | arch/arm/configs/tegra3_defconfig | 5 | ||||
| -rw-r--r-- | drivers/media/video/tegra/Kconfig | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/configs/tegra3_defconfig b/arch/arm/configs/tegra3_defconfig index 207c5e5771dc..9f212bbad50b 100644 --- a/arch/arm/configs/tegra3_defconfig +++ b/arch/arm/configs/tegra3_defconfig @@ -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 diff --git a/drivers/media/video/tegra/Kconfig b/drivers/media/video/tegra/Kconfig index 571b49bfd699..5099fe12c3e2 100644 --- a/drivers/media/video/tegra/Kconfig +++ b/drivers/media/video/tegra/Kconfig @@ -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 |