diff --git a/drivers/platform/tegra/Makefile b/drivers/platform/tegra/Makefile
index 00e9838b..c7b8f3fa 100644
--- a/drivers/platform/tegra/Makefile
+++ b/drivers/platform/tegra/Makefile
@@ -10,9 +10,6 @@ tegra-cactmon-objs += actmon_common.o
 obj-m += tegra-cactmon.o
 obj-m += tegra-fsicom.o
 
-tegra-camera-rtcpu-objs :=  tegra-camera-rtcpu-base.o rtcpu/tegra-rtcpu-trace.o rtcpu/rtcpu-monitor.o
-obj-m += tegra-camera-rtcpu.o
-
 obj-m += mce/
 ifdef CONFIG_PERF_EVENTS
 obj-m += uncore_pmu/
diff --git a/drivers/platform/tegra/rtcpu/Makefile b/drivers/platform/tegra/rtcpu/Makefile
index eb7b4213..ccc0ecdb 100644
--- a/drivers/platform/tegra/rtcpu/Makefile
+++ b/drivers/platform/tegra/rtcpu/Makefile
@@ -16,3 +16,6 @@ obj-m += clk-group.o
 obj-m += hsp-mailbox-client.o
 obj-m += reset-group.o
 obj-m += device-group.o
+
+tegra-camera-rtcpu-objs :=  tegra-camera-rtcpu-base.o tegra-rtcpu-trace.o rtcpu-monitor.o
+obj-m += tegra-camera-rtcpu.o
diff --git a/drivers/platform/tegra/tegra-camera-rtcpu-base.c b/drivers/platform/tegra/rtcpu/tegra-camera-rtcpu-base.c
similarity index 99%
rename from drivers/platform/tegra/tegra-camera-rtcpu-base.c
rename to drivers/platform/tegra/rtcpu/tegra-camera-rtcpu-base.c
index d92ad6ce..2fd78ea9 100644
--- a/drivers/platform/tegra/tegra-camera-rtcpu-base.c
+++ b/drivers/platform/tegra/rtcpu/tegra-camera-rtcpu-base.c
@@ -32,9 +32,9 @@
 #include <linux/version.h>
 #include <linux/wait.h>
 
-#include "rtcpu/clk-group.h"
-#include "rtcpu/device-group.h"
-#include "rtcpu/reset-group.h"
+#include "clk-group.h"
+#include "device-group.h"
+#include "reset-group.h"
 #include "linux/tegra-hsp-combo.h"
 
 #include "soc/tegra/camrtc-commands.h"