From: Dima Zavin <dima@android.com>
Date: Mon, 8 Nov 2010 08:04:30 +0000 (-0800)
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~357
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=156efc3e2da7243975d4c4145e212a6b1d85704d;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:
	arch/arm/mach-tegra/devices.h
	arch/arm/mach-tegra/include/mach/iomap.h

Change-Id: I4c37389a3ac359b274bf4b45d7a1fb8cfae8c1f9
---

156efc3e2da7243975d4c4145e212a6b1d85704d
diff --cc drivers/media/video/tegra/Makefile
index b0274a04b40d,68b5c42b0e7a..1a70f4bc7d4b
--- a/drivers/media/video/tegra/Makefile
+++ b/drivers/media/video/tegra/Makefile
@@@ -1,4 -1,2 +1,5 @@@
+ obj-y				+= avp/
  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