summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Chew <achew@nvidia.com>2012-08-01 12:57:12 -0700
committerMatthew Pedro <mapedro@nvidia.com>2013-03-05 09:42:04 -0800
commitcf430cbe6d219edf9da694697a5406bf27ed39a0 (patch)
treeb2de49841ae31bed72640a5e01ca9de8246c14c5
parent0bee410db5fdb5a97578b6dc002b7d54fedbfe64 (diff)
tegra: When using V4L2, don't use vi client.
The VI client within drivers/video/tegra is mutually exclusive with the Tegra V4L2 framework, since they both want to own the camera hardware. Change-Id: Idebd0f619f5fc7eb6323b2e08c29c9692c8887a0 Signed-off-by: Andrew Chew <achew@nvidia.com> Signed-off-by: Bryan Wu <pengw@nvidia.com> Reviewed-on: http://git-master/r/200221 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
-rw-r--r--drivers/video/tegra/host/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/tegra/host/Makefile b/drivers/video/tegra/host/Makefile
index 6e5e469897b3..c2608218c811 100644
--- a/drivers/video/tegra/host/Makefile
+++ b/drivers/video/tegra/host/Makefile
@@ -22,7 +22,9 @@ obj-$(CONFIG_TEGRA_GRHOST) += t20/
obj-$(CONFIG_TEGRA_GRHOST) += t30/
obj-$(CONFIG_TEGRA_GRHOST) += gr2d/
obj-$(CONFIG_TEGRA_GRHOST) += isp/
+ifeq ($(CONFIG_TEGRA_CAMERA),y)
obj-$(CONFIG_TEGRA_GRHOST) += vi/
+endif
obj-$(CONFIG_TEGRA_GRHOST) += nvhost.o
obj-$(CONFIG_TEGRA_GRHOST_USE_NVMAP) += nvmap.o