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:37:38 +1000 |
commit | e23c68ab7cca9fb237404a8f5260cf32b265007f (patch) | |
tree | a2b026c61e3329860ffef2d6b976a110496ceee9 /drm/nouveau/include/nvkm/subdev/volt.h | |
parent | 1a9ed92b4053e7453228b2672e2dbac925faa4ba (diff) | |
download | nouveau-e23c68ab7cca9fb237404a8f5260cf32b265007f.tar.gz |
subdev: rename some functions to avoid upcoming conflicts
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/include/nvkm/subdev/volt.h')
-rw-r--r-- | drm/nouveau/include/nvkm/subdev/volt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/nouveau/include/nvkm/subdev/volt.h b/drm/nouveau/include/nvkm/subdev/volt.h index 1eeb80a38..dc8846899 100644 --- a/drm/nouveau/include/nvkm/subdev/volt.h +++ b/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 **); |