diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:16 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:33 +1000 |
| commit | aa35888ff024b18c7b6b29eb773a221f642987f7 (patch) | |
| tree | fff59d717c0b36c63dfa25020f69b4eb9e341644 /drivers/gpu/drm/nouveau/include/nvkm/core/object.h | |
| parent | d61f4c178cb36a7b15871fcc60814f1f94a5044d (diff) | |
drm/nouveau/object: rename some functions to avoid upcoming conflicts
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include/nvkm/core/object.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/core/object.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/object.h b/drivers/gpu/drm/nouveau/include/nvkm/core/object.h index 005cd4a86849..39a4962d3982 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/object.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/object.h @@ -50,8 +50,8 @@ nv_object(void *obj) int nvkm_object_create_(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, u32, int size, void **); void nvkm_object_destroy(struct nvkm_object *); -int nvkm_object_init(struct nvkm_object *); -int nvkm_object_fini(struct nvkm_object *, bool suspend); +int _nvkm_object_init(struct nvkm_object *); +int _nvkm_object_fini(struct nvkm_object *, bool suspend); int _nvkm_object_ctor(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, void *, u32, @@ -112,7 +112,7 @@ nv_ofuncs(void *obj) return nv_oclass(obj)->ofuncs; } -int nvkm_object_ctor(struct nvkm_object *, struct nvkm_object *, +int nvkm_object_old(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, void *, u32, struct nvkm_object **); void nvkm_object_ref(struct nvkm_object *, struct nvkm_object **); |