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 | aa35888ff024b18c7b6b29eb773a221f642987f7 (patch) | |
tree | fff59d717c0b36c63dfa25020f69b4eb9e341644 /drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c | |
parent | d61f4c178cb36a7b15871fcc60814f1f94a5044d (diff) | |
download | linux-aa35888ff024b18c7b6b29eb773a221f642987f7.tar.xz |
drm/nouveau/object: rename some functions to avoid upcoming conflicts
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c index 3be8a796d797..3e51dc772536 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c @@ -169,7 +169,7 @@ nv44_mmu_ctor(struct nvkm_object *parent, struct nvkm_object *engine, if (pci_find_capability(device->pdev, PCI_CAP_ID_AGP) || !nvkm_boolopt(device->cfgopt, "NvPCIE", true)) { - return nvkm_object_ctor(parent, engine, &nv04_mmu_oclass, + return nvkm_object_old(parent, engine, &nv04_mmu_oclass, data, size, pobject); } |