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

diff --cc arch/arm/mach-tegra/Makefile
Simple merge

diff --cc drivers/media/video/tegra/Kconfig
index 6c3972c1365b6158e9aefbc94b6346faa3a09cc6,86c6aa2c466b624e2eb18a7d8fc571e951f2b049..0ade032b9128d99a65c084f11869a144eb5aee59
--- 1/drivers/media/video/tegra/Kconfig
--- 2/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 21b08726abbfc2703bd76f49445bac94bb44d13a,e5a074ea6608a4551aebd01f135ffd9e3aa72bfb..b0274a04b40de047dc171b83816e33e7e1b172d3
--- 1/drivers/media/video/tegra/Makefile
--- 2/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