Merge tag 'tilcdc-4.15-fixes' of https://github.com/jsarha/linux into drm-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / nouveau / nouveau_display.h

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.h b/drivers/gpu/drm/nouveau/nouveau_display.h
index 201aec2ea5b81c690e10c6765e0a406ec9af197c..1411bf05b89d5de1971cacd91856257a668aed7b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_display.h
+++ b/drivers/gpu/drm/nouveau/nouveau_display.h
@@ -1,14 +1,11 @@
 #ifndef __NOUVEAU_DISPLAY_H__
 #define __NOUVEAU_DISPLAY_H__
-
-#include <subdev/mmu.h>
-
 #include "nouveau_drv.h"
 
 struct nouveau_framebuffer {
        struct drm_framebuffer base;
        struct nouveau_bo *nvbo;
-       struct nvkm_vma vma;
+       struct nouveau_vma *vma;
        u32 r_handle;
        u32 r_format;
        u32 r_pitch;