Merge tag 'drm-for-v4.15' of git://people.freedesktop.org/~airlied/linux

[linux-2.6-block.git] / drivers / gpu / drm / nouveau / nvkm / subdev / fb / nv50.h

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h
index a37758c76268f2e8232cabafaa53abc74d88a42b..dacc696387b62b44e7e208c2bdedba93bf16c4c6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h
@@ -13,10 +13,10 @@ struct nv50_fb {
 
 struct nv50_fb_func {
        int (*ram_new)(struct nvkm_fb *, struct nvkm_ram **);
+       u32 (*tags)(struct nvkm_fb *);
        u32 trap;
 };
 
 int nv50_fb_new_(const struct nv50_fb_func *, struct nvkm_device *, int index,
                 struct nvkm_fb **pfb);
-extern int nv50_fb_memtype[0x80];
 #endif