diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-12 12:33:37 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 12:17:49 +1000 |
commit | 989aa5b76ad2af7653353cf01bdebec2ba9436aa (patch) | |
tree | 1101d4d85c6034c902f5956877f268dff1a144c9 /drivers/gpu/drm/nouveau/dispnv04/disp.h | |
parent | c4345146dbee38d949efd3a7b96d1bea962a29f2 (diff) | |
download | linux-989aa5b76ad2af7653353cf01bdebec2ba9436aa.tar.gz linux-989aa5b76ad2af7653353cf01bdebec2ba9436aa.tar.bz2 linux-989aa5b76ad2af7653353cf01bdebec2ba9436aa.zip |
drm/nouveau/nvif: namespace of nvkm accessors (no binary change)
NVKM is having it's namespace switched to nvkm_, which will conflict
with these functions (which are workarounds for the fact that as of
yet, we still aren't able to split DRM and NVKM completely).
A comparison of objdump disassemblies proves no code changes.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv04/disp.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/dispnv04/disp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.h b/drivers/gpu/drm/nouveau/dispnv04/disp.h index 3ad3ee818c1a..fe4901cfae27 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/disp.h +++ b/drivers/gpu/drm/nouveau/dispnv04/disp.h @@ -170,7 +170,7 @@ nouveau_bios_run_init_table(struct drm_device *dev, u16 table, struct dcb_output *outp, int crtc) { struct nouveau_drm *drm = nouveau_drm(dev); - struct nouveau_bios *bios = nvkm_bios(&drm->device); + struct nouveau_bios *bios = nvxx_bios(&drm->device); struct nvbios_init init = { .subdev = nv_subdev(bios), .bios = bios, |