diff options
| author | Ben Skeggs | 2015-08-20 06:54:16 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2015-08-28 04:40:33 +0200 |
| commit | 3a8c3400f3e74638bedd0d2410416aa8b794c0fd (patch) | |
| tree | 58e96ece8de1e14939754ecb14f126d8bb937c2d /drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h | |
| parent | drm/nouveau/object: rename some functions to avoid upcoming conflicts (diff) | |
| download | kernel-qcow2-linux-3a8c3400f3e74638bedd0d2410416aa8b794c0fd.tar.gz kernel-qcow2-linux-3a8c3400f3e74638bedd0d2410416aa8b794c0fd.tar.xz kernel-qcow2-linux-3a8c3400f3e74638bedd0d2410416aa8b794c0fd.zip | |
drm/nouveau/subdev: rename some functions to avoid upcoming conflicts
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h index e6e4dfc97dcc..e9d2f7b6b22f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h @@ -5,9 +5,9 @@ #define nvkm_bar_create(p,e,o,d) \ nvkm_bar_create_((p), (e), (o), sizeof(**d), (void **)d) #define nvkm_bar_init(p) \ - nvkm_subdev_init(&(p)->subdev) + nvkm_subdev_init_old(&(p)->subdev) #define nvkm_bar_fini(p,s) \ - nvkm_subdev_fini(&(p)->subdev, (s)) + nvkm_subdev_fini_old(&(p)->subdev, (s)) int nvkm_bar_create_(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, int, void **); |