From aa35888ff024b18c7b6b29eb773a221f642987f7 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 20 Aug 2015 14:54:16 +1000 Subject: drm/nouveau/object: rename some functions to avoid upcoming conflicts Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c') diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c index b75395bf8ffa..ac27f511163a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c @@ -419,8 +419,8 @@ static struct nvkm_ofuncs nvkm_perfdom_ofuncs = { .ctor = nvkm_perfdom_ctor, .dtor = nvkm_perfdom_dtor, - .init = nvkm_object_init, - .fini = nvkm_object_fini, + .init = _nvkm_object_init, + .fini = _nvkm_object_fini, .mthd = nvkm_perfdom_mthd, }; -- cgit v1.2.3