diff --git a/Makefile b/Makefile
index dff2b9ee67fa..3764356262ad 100644
--- a/Makefile
+++ b/Makefile
@@ -53,4 +53,3 @@ LINUXINCLUDE    += -include $(srctree)/techpack/display/config/bengaldispconf.h
 endif
 
 obj-$(CONFIG_DRM_MSM) += msm/
-obj-$(CONFIG_MSM_SDE_ROTATOR) += rotator/
diff --git a/msm/Makefile b/msm/Makefile
index 34f70d576ccd..00c3b5377c4c 100644
--- a/msm/Makefile
+++ b/msm/Makefile
@@ -137,6 +137,23 @@ msm_drm-$(CONFIG_DRM_MSM) += \
 
 msm_drm-$(CONFIG_HDCP_QSEECOM) += ../hdcp/msm_hdcp.o \
 
+msm_drm-$(CONFIG_MSM_SDE_ROTATOR) += ../rotator/sde_rotator_dev.o \
+	../rotator/sde_rotator_core.o \
+	../rotator/sde_rotator_base.o \
+	../rotator/sde_rotator_formats.o \
+	../rotator/sde_rotator_util.o \
+	../rotator/sde_rotator_io_util.o \
+	../rotator/sde_rotator_smmu.o \
+	../rotator/sde_rotator_r1_wb.o \
+	../rotator/sde_rotator_r1_pipe.o \
+	../rotator/sde_rotator_r1_ctl.o \
+	../rotator/sde_rotator_r1.o \
+	../rotator/sde_rotator_r3.o \
+	../rotator/sde_rotator_sync.o \
+	../rotator/sde_rotator_debug.o \
+	../rotator/sde_rotator_r1_debug.o \
+	../rotator/sde_rotator_r3_debug.o
+
 obj-$(CONFIG_DISPLAY_BUILD)	+= msm_drm.o
 
 obj-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o
diff --git a/rotator/Makefile b/rotator/Makefile
deleted file mode 100644
index d72ac73a8bbc..000000000000
--- a/rotator/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-ccflags-y += -I$(src) -Idrivers/staging/android
-
-obj-$(CONFIG_MSM_SDE_ROTATOR) += sde_rotator_dev.o \
-	sde_rotator_dev.o \
-	sde_rotator_core.o \
-	sde_rotator_base.o \
-	sde_rotator_formats.o \
-	sde_rotator_util.o \
-	sde_rotator_io_util.o \
-	sde_rotator_smmu.o \
-	sde_rotator_r1_wb.o \
-	sde_rotator_r1_pipe.o \
-	sde_rotator_r1_ctl.o \
-	sde_rotator_r1.o \
-	sde_rotator_r3.o \
-
-obj-$(CONFIG_SYNC_FILE) += \
-	sde_rotator_sync.o \
-
-obj-$(CONFIG_DEBUG_FS) += \
-	sde_rotator_debug.o \
-	sde_rotator_r1_debug.o \
-	sde_rotator_r3_debug.o \