diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index e756aac55..ec28f2f77 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -225,6 +225,7 @@ nvgpu-y += \
 	common/mm/allocators/lockless_allocator.o \
 	common/mm/gmmu/page_table.o \
 	common/mm/gmmu/pd_cache.o \
+	common/mm/as.o \
 	common/mm/vm.o \
 	common/mm/vm_area.o \
 	common/mm/nvgpu_mem.o \
@@ -236,7 +237,6 @@ nvgpu-y += \
 	common/string.o \
 	common/pramin.o \
 	common/semaphore.o \
-	common/as.o \
 	common/rbtree.o \
 	common/vbios/bios.o \
 	common/falcon/falcon.o \
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources
index dfc28ce9b..f81a755e0 100644
--- a/drivers/gpu/nvgpu/Makefile.sources
+++ b/drivers/gpu/nvgpu/Makefile.sources
@@ -53,6 +53,7 @@ srcs :=	os/posix/nvgpu.c \
 	common/mm/allocators/lockless_allocator.c \
 	common/mm/gmmu/page_table.c \
 	common/mm/gmmu/pd_cache.c \
+	common/mm/as.c \
 	common/mm/vm.c \
 	common/mm/vm_area.c \
 	common/mm/nvgpu_mem.c \
@@ -91,7 +92,6 @@ srcs :=	os/posix/nvgpu.c \
 	common/pramin.c \
 	common/semaphore.c \
 	common/string.c \
-	common/as.c \
 	common/rbtree.c \
 	common/ltc/ltc.c \
 	common/ltc/ltc_gm20b.c \
diff --git a/drivers/gpu/nvgpu/common/as.c b/drivers/gpu/nvgpu/common/mm/as.c
similarity index 100%
rename from drivers/gpu/nvgpu/common/as.c
rename to drivers/gpu/nvgpu/common/mm/as.c