diff options
| author | Andrew Chew <achew@nvidia.com> | 2012-08-01 12:57:12 -0700 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-03-03 23:32:19 +0100 |
| commit | 2707e534228a0e76a21098a751ae31e1088b4082 (patch) | |
| tree | c94708bb3ce06721a7ee2c7c9b04a5fce051e3b2 | |
| parent | 5cdb67f676ffd3e577c5ad1d724369c8c11d1cfd (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.
Signed-off-by: Andrew Chew <achew@nvidia.com>
| -rw-r--r-- | drivers/video/tegra/host/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/tegra/host/Makefile b/drivers/video/tegra/host/Makefile index 6e5e469897b3..0448a4da1f9b 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/ +ifneq ($(CONFIG_VIDEO_TEGRA),y) obj-$(CONFIG_TEGRA_GRHOST) += vi/ +endif obj-$(CONFIG_TEGRA_GRHOST) += nvhost.o obj-$(CONFIG_TEGRA_GRHOST_USE_NVMAP) += nvmap.o |