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:34 +1000 |
| commit | 89c651e2213a148d19407109051abbf81328a4a8 (patch) | |
| tree | c491408991c4fc895302b92aa3f00746a5cf11a5 /drivers/gpu/drm/nouveau/include/nvkm/core/engine.h | |
| parent | 3a8c3400f3e74638bedd0d2410416aa8b794c0fd (diff) | |
| download | linux-89c651e2213a148d19407109051abbf81328a4a8.tar.gz linux-89c651e2213a148d19407109051abbf81328a4a8.tar.xz | |
drm/nouveau/engine: 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/engine.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/core/engine.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h b/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h index 3212b12a70ed..f98980e15f26 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h @@ -40,9 +40,9 @@ struct nvkm_engine *nvkm_engine(void *obj, int idx); #define nvkm_engine_destroy(p) \ nvkm_subdev_destroy(&(p)->subdev) -#define nvkm_engine_init(p) \ +#define nvkm_engine_init_old(p) \ nvkm_subdev_init_old(&(p)->subdev) -#define nvkm_engine_fini(p,s) \ +#define nvkm_engine_fini_old(p,s) \ nvkm_subdev_fini_old(&(p)->subdev, (s)) int nvkm_engine_create_(struct nvkm_object *, struct nvkm_object *, |