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/engine/sw.h | |
parent | 3a8c3400f3e74638bedd0d2410416aa8b794c0fd (diff) |
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/engine/sw.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h index c46e5595573b..8dae95829f66 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h @@ -33,9 +33,9 @@ struct nvkm_sw { #define nvkm_sw_destroy(d) \ nvkm_engine_destroy(&(d)->engine) #define nvkm_sw_init(d) \ - nvkm_engine_init(&(d)->engine) + nvkm_engine_init_old(&(d)->engine) #define nvkm_sw_fini(d,s) \ - nvkm_engine_fini(&(d)->engine, (s)) + nvkm_engine_fini_old(&(d)->engine, (s)) #define _nvkm_sw_dtor _nvkm_engine_dtor #define _nvkm_sw_init _nvkm_engine_init |