From: Dima Zavin <dima@android.com>
Date: Tue, 2 Nov 2010 23:25:53 +0000 (-0700)
Subject: Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
X-Git-Tag: firefly_0821_release~9834^2~381
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=01c2254a40132857808be5c021c2f4936c7506d9;p=firefly-linux-kernel-4.4.55.git

Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36

Conflicts:
	drivers/media/video/tegra/Kconfig
	drivers/media/video/tegra/Makefile
---

01c2254a40132857808be5c021c2f4936c7506d9
diff --cc drivers/media/video/tegra/Kconfig
index 6c3972c1365b,86c6aa2c466b..0ade032b9128
--- a/drivers/media/video/tegra/Kconfig
+++ b/drivers/media/video/tegra/Kconfig
@@@ -1,20 -1,8 +1,28 @@@
+ 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
+ 
+           If unsure, say Y
++
 +config VIDEO_OV5650
 +        tristate "OV5650 camera sensor support"
 +        depends on I2C && ARCH_TEGRA
 +        ---help---
 +          This is a driver for the Omnivision OV5650 5MP camera sensor
 +	  for use with the tegra isp.
 +
 +config VIDEO_SOC2030
 +        tristate "SOC2030 camera sensor support"
 +        depends on I2C && ARCH_TEGRA
 +        ---help---
 +          This is a driver for the SOC2030 2MP camera sensor
 +	  for use with the tegra isp.
 +
 +config VIDEO_DW9714L
 +        tristate "DW9714L focuser support"
 +        depends on I2C && ARCH_TEGRA
 +        ---help---
 +          This is a driver for the the dw9714l focuser.
- 
diff --cc drivers/media/video/tegra/Makefile
index 21b08726abbf,e5a074ea6608..b0274a04b40d
--- a/drivers/media/video/tegra/Makefile
+++ b/drivers/media/video/tegra/Makefile
@@@ -1,3 -1,1 +1,4 @@@
+ obj-$(CONFIG_TEGRA_CAMERA)		+= tegra_camera.o
 +obj-$(CONFIG_VIDEO_OV5650)	+= ov5650.o
 +obj-$(CONFIG_VIDEO_SOC2030)	+= soc2030.o
 +obj-$(CONFIG_VIDEO_DW9714L)	+= dw9714l.o