diff options
Diffstat (limited to 'drm/nouveau/nvkm/subdev/mc/nv04.h')
-rw-r--r-- | drm/nouveau/nvkm/subdev/mc/nv04.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/drm/nouveau/nvkm/subdev/mc/nv04.h b/drm/nouveau/nvkm/subdev/mc/nv04.h index 4d9ea46c4..411de3d08 100644 --- a/drm/nouveau/nvkm/subdev/mc/nv04.h +++ b/drm/nouveau/nvkm/subdev/mc/nv04.h @@ -1,22 +1,20 @@ #ifndef __NVKM_MC_NV04_H__ #define __NVKM_MC_NV04_H__ - #include "priv.h" struct nv04_mc_priv { - struct nouveau_mc base; + struct nvkm_mc base; }; -int nv04_mc_ctor(struct nouveau_object *, struct nouveau_object *, - struct nouveau_oclass *, void *, u32, - struct nouveau_object **); - -extern const struct nouveau_mc_intr nv04_mc_intr[]; -int nv04_mc_init(struct nouveau_object *); -void nv40_mc_msi_rearm(struct nouveau_mc *); -int nv44_mc_init(struct nouveau_object *object); -int nv50_mc_init(struct nouveau_object *); -extern const struct nouveau_mc_intr nv50_mc_intr[]; -extern const struct nouveau_mc_intr nvc0_mc_intr[]; +int nv04_mc_ctor(struct nvkm_object *, struct nvkm_object *, + struct nvkm_oclass *, void *, u32, + struct nvkm_object **); +extern const struct nvkm_mc_intr nv04_mc_intr[]; +int nv04_mc_init(struct nvkm_object *); +void nv40_mc_msi_rearm(struct nvkm_mc *); +int nv44_mc_init(struct nvkm_object *object); +int nv50_mc_init(struct nvkm_object *); +extern const struct nvkm_mc_intr nv50_mc_intr[]; +extern const struct nvkm_mc_intr gf100_mc_intr[]; #endif |