1 files changed, 13 insertions, 13 deletions

diff --git a/drm/nouveau/include/nvkm/core/mm.h b/drm/nouveau/include/nvkm/core/mm.h
index bfe693154..096eb1a62 100644
--- a/drm/nouveau/include/nvkm/core/mm.h
+++ b/drm/nouveau/include/nvkm/core/mm.h
@@ -1,7 +1,8 @@
-#ifndef __NOUVEAU_MM_H__
-#define __NOUVEAU_MM_H__
+#ifndef __NVKM_MM_H__
+#define __NVKM_MM_H__
+#include <core/os.h>
 
-struct nouveau_mm_node {
+struct nvkm_mm_node {
 	struct list_head nl_entry;
 	struct list_head fl_entry;
 	struct list_head rl_entry;
@@ -15,7 +16,7 @@ struct nouveau_mm_node {
 	u32 length;
 };
 
-struct nouveau_mm {
+struct nvkm_mm {
 	struct list_head nodes;
 	struct list_head free;
 
@@ -24,17 +25,16 @@ struct nouveau_mm {
 };
 
 static inline bool
-nouveau_mm_initialised(struct nouveau_mm *mm)
+nvkm_mm_initialised(struct nvkm_mm *mm)
 {
 	return mm->block_size != 0;
 }
 
-int  nouveau_mm_init(struct nouveau_mm *, u32 offset, u32 length, u32 block);
-int  nouveau_mm_fini(struct nouveau_mm *);
-int  nouveau_mm_head(struct nouveau_mm *, u8 heap, u8 type, u32 size_max,
-		     u32 size_min, u32 align, struct nouveau_mm_node **);
-int  nouveau_mm_tail(struct nouveau_mm *, u8 heap, u8 type, u32 size_max,
-		     u32 size_min, u32 align, struct nouveau_mm_node **);
-void nouveau_mm_free(struct nouveau_mm *, struct nouveau_mm_node **);
-
+int  nvkm_mm_init(struct nvkm_mm *, u32 offset, u32 length, u32 block);
+int  nvkm_mm_fini(struct nvkm_mm *);
+int  nvkm_mm_head(struct nvkm_mm *, u8 heap, u8 type, u32 size_max,
+		  u32 size_min, u32 align, struct nvkm_mm_node **);
+int  nvkm_mm_tail(struct nvkm_mm *, u8 heap, u8 type, u32 size_max,
+		  u32 size_min, u32 align, struct nvkm_mm_node **);
+void nvkm_mm_free(struct nvkm_mm *, struct nvkm_mm_node **);
 #endif