drivers: video: camera: Fix build issue

Bug 1736471

Change-Id: Icd3f1934d535b14052ad40eda76d2675cdad4b8d
Signed-off-by: Bhanu Murthy V <bmurthyv@nvidia.com>
Reviewed-on: http://git-master/r/1120539
(cherry picked from commit a0cc4a775b29c8b0c94c2e4ad69cf69bfaefd372)
Reviewed-on: http://git-master/r/1149894

diff --git a/drivers/media/platform/tegra/camera/mc_common.h b/drivers/media/platform/tegra/camera/mc_common.h
index 16feb997ee7e213f05bb913047a1643745d529f9..84418a6d3fc73fd601a42196de9854f8254e30aa 100644 (file)
--- a/drivers/media/platform/tegra/camera/mc_common.h
+++ b/drivers/media/platform/tegra/camera/mc_common.h
@@ -29,8 +29,8 @@
 #include <media/v4l2-dev.h>
 #include <media/videobuf2-core.h>
 
-#include "camera/core.h"
-#include "csi/csi.h"
+#include "core.h"
+#include "../csi/csi.h"
 
 #define MAX_FORMAT_NUM 64
 #define MAX_SUBDEVICES 4

diff --git a/drivers/media/platform/tegra/csi/csi.h b/drivers/media/platform/tegra/csi/csi.h
index b6efd173832d373f10acd71602affbc56976f49e..fa8d0ea7459ddede396241b51b5a14de7042d3ab 100644 (file)
--- a/drivers/media/platform/tegra/csi/csi.h
+++ b/drivers/media/platform/tegra/csi/csi.h
@@ -19,7 +19,7 @@
 #include <media/v4l2-subdev.h>
 
 #include <media/camera_common.h>
-#include "camera/registers.h"
+#include "../camera/registers.h"
 
 enum tegra_csi_port_num {
        PORT_A = 0,

diff --git a/drivers/media/platform/tegra/vi/Makefile b/drivers/media/platform/tegra/vi/Makefile
index 8a628465ac5c97eb9324b54452332fe5da0a0569..43d852aeab2c4a9469abd3013c6d3621e6dcbec9 100644 (file)
--- a/drivers/media/platform/tegra/vi/Makefile
+++ b/drivers/media/platform/tegra/vi/Makefile
@@ -2,7 +2,7 @@ GCOV_PROFILE := y
 ccflags-y += -I../nvhost/drivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/camera
-ccflags-y += -Idrivers/media/platform/tegra/camera
+ccflags-y += -Idrivers/media/platform/tegra/
 ccflags-y += -Werror
 
 ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)

diff --git a/drivers/video/tegra/camera/Makefile b/drivers/video/tegra/camera/Makefile
index 5a2f63f9fc1a3ff846e3dfc576bc3c4df155ea52..0604abf6f10bf7e36979acb1426267cfade0e3b3 100644 (file)
--- a/drivers/video/tegra/camera/Makefile
+++ b/drivers/video/tegra/camera/Makefile
@@ -1,7 +1,7 @@
 GCOV_PROFILE := y
 ccflags-y += -I../nvhost/drivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/host
-ccflags-y += -Idrivers/media/platform/tegra/vi
+ccflags-y += -Idrivers/media/platform/tegra/
 
 ifdef CONFIG_TEGRA_CAMERA_PLATFORM
 obj-y += tegra_camera_platform.o

diff --git a/drivers/video/tegra/camera/tegra_camera_platform.c b/drivers/video/tegra/camera/tegra_camera_platform.c
index 89cb3269fdff6ebd0ed2805556f56407e91a60fd..95d52484f44f4a76d253558fce3585e44df94d3a 100644 (file)
--- a/drivers/video/tegra/camera/tegra_camera_platform.c
+++ b/drivers/video/tegra/camera/tegra_camera_platform.c
@@ -23,7 +23,7 @@
 #include <linux/of.h>
 #include <soc/tegra/tegra_emc.h>
 
-#include "vi.h"
+#include "vi/vi.h"
 #include "tegra_camera_dev_mfi.h"
 #include "tegra_camera_platform.h"