diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 07:54:16 +0300 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 05:40:33 +0300 |
commit | 3a8c3400f3e74638bedd0d2410416aa8b794c0fd (patch) | |
tree | 58e96ece8de1e14939754ecb14f126d8bb937c2d /drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h | |
parent | aa35888ff024b18c7b6b29eb773a221f642987f7 (diff) | |
download | linux-3a8c3400f3e74638bedd0d2410416aa8b794c0fd.tar.xz |
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/include/nvkm/subdev/volt.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h index 1eeb80a380d2..dc8846899a60 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h @@ -41,7 +41,7 @@ nvkm_volt(void *obj) _nvkm_volt_init(nv_object(v)); \ }) #define nvkm_volt_fini(p,s) \ - nvkm_subdev_fini((p), (s)) + nvkm_subdev_fini_old((p), (s)) int nvkm_volt_create_(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, int, void **); |