diff --git a/kernel/nvidia/drivers/media/i2c/Kconfig b/kernel/nvidia-spiri/drivers/media/i2c/Kconfig
similarity index 100%
rename from kernel/nvidia/drivers/media/i2c/Kconfig
rename to kernel/nvidia-spiri/drivers/media/i2c/Kconfig
diff --git a/kernel/nvidia-spiri/drivers/media/i2c/Makefile b/kernel/nvidia-spiri/drivers/media/i2c/Makefile
new file mode 100644
index 0000000..0b08aa6
--- /dev/null
+++ b/kernel/nvidia-spiri/drivers/media/i2c/Makefile
@@ -0,0 +1,10 @@
+subdir-ccflags-y += -Werror
+
+obj-$(CONFIG_VIDEO_I2C_SPIRI_CAM) += mt9m021.o
+
+ccflags-$(CONFIG_VIDEO_I2C_SPIRI_CAM) := -I$(srctree.nvidia-spiri)/include/
+ccflags-$(CONFIG_VIDEO_I2C_SPIRI_CAM) += -I$(srctree.nvidia-spiri)/include/media/
+ccflags-$(CONFIG_VIDEO_I2C_SPIRI_CAM) += -I$(srctree.nvidia-spiri)/drivers/media/i2c/
+
+ccflags-$(CONFIG_VIDEO_I2C_SPIRI_CAM) += -I$(srctree.nvidia)/drivers/media/platform/tegra/camera
+
diff --git a/kernel/nvidia/drivers/media/i2c/mt9m021.c b/kernel/nvidia-spiri/drivers/media/i2c/mt9m021.c
similarity index 99%
rename from kernel/nvidia/drivers/media/i2c/mt9m021.c
rename to kernel/nvidia-spiri/drivers/media/i2c/mt9m021.c
index 6fcd422..e34291e 100644
--- a/kernel/nvidia/drivers/media/i2c/mt9m021.c
+++ b/kernel/nvidia-spiri/drivers/media/i2c/mt9m021.c
@@ -32,7 +32,7 @@
 #include <media/tegra_v4l2_camera.h>
 #include <media/tegracam_core.h>
 
-#include "../platform/tegra/camera/camera_gpio.h"
+#include "camera_gpio.h"
 #include "mt9m021_mode_tbls.h"
 
 /***************************************************
diff --git a/kernel/nvidia/drivers/media/i2c/mt9m021_mode_tbls.h b/kernel/nvidia-spiri/drivers/media/i2c/mt9m021_mode_tbls.h
similarity index 99%
rename from kernel/nvidia/drivers/media/i2c/mt9m021_mode_tbls.h
rename to kernel/nvidia-spiri/drivers/media/i2c/mt9m021_mode_tbls.h
index 128173e..6bd8277 100644
--- a/kernel/nvidia/drivers/media/i2c/mt9m021_mode_tbls.h
+++ b/kernel/nvidia-spiri/drivers/media/i2c/mt9m021_mode_tbls.h
@@ -21,7 +21,7 @@
 #ifndef __MT9M021_I2C_TABLES__
 #define __MT9M021_I2C_TABLES__
 
-#include <media/camera_common.h>
+#include "media/camera_common.h"
 
 #define MT9M021_TABLE_WAIT_MS    0
 #define MT9M021_TABLE_END        1
diff --git a/kernel/nvidia/drivers/media/platform/tegra/camera/camera_common.c b/kernel/nvidia-spiri/drivers/media/platform/tegra/camera/camera_common.c
similarity index 100%
rename from kernel/nvidia/drivers/media/platform/tegra/camera/camera_common.c
rename to kernel/nvidia-spiri/drivers/media/platform/tegra/camera/camera_common.c
diff --git a/kernel/nvidia/drivers/media/platform/tegra/camera/tegracam_ctrls.c b/kernel/nvidia-spiri/drivers/media/platform/tegra/camera/tegracam_ctrls.c
similarity index 100%
rename from kernel/nvidia/drivers/media/platform/tegra/camera/tegracam_ctrls.c
rename to kernel/nvidia-spiri/drivers/media/platform/tegra/camera/tegracam_ctrls.c
diff --git a/kernel/nvidia/include/media/camera_common.h b/kernel/nvidia-spiri/include/media/camera_common.h
similarity index 100%
rename from kernel/nvidia/include/media/camera_common.h
rename to kernel/nvidia-spiri/include/media/camera_common.h
diff --git a/kernel/nvidia/include/media/mt9m021.h b/kernel/nvidia-spiri/include/media/mt9m021.h
similarity index 100%
rename from kernel/nvidia/include/media/mt9m021.h
rename to kernel/nvidia-spiri/include/media/mt9m021.h
diff --git a/kernel/nvidia/include/media/tegra-v4l2-camera.h b/kernel/nvidia-spiri/include/media/tegra-v4l2-camera.h
similarity index 100%
rename from kernel/nvidia/include/media/tegra-v4l2-camera.h
rename to kernel/nvidia-spiri/include/media/tegra-v4l2-camera.h
diff --git a/kernel/nvidia/drivers/media/i2c/Makefile b/kernel/nvidia/drivers/media/i2c/Makefile
deleted file mode 100644
index 34211ed..0000000
--- a/kernel/nvidia/drivers/media/i2c/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-subdir-ccflags-y += -Werror
-ccflags-y += -I$(srctree)/drivers/media/platform/tegra
-ccflags-y += -I$(srctree)/drivers/video/tegra/camera
-
-obj-$(CONFIG_VIDEO_I2C_SPIRI_CAM) += mt9m021.o