diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-12 12:33:37 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-19 14:23:01 +1000 |
| commit | d339db83b993c89c77c6ab85a6139e4bcd330c77 (patch) | |
| tree | f982e0511df99a4a1e7850d2daf5f251f4e2afa1 /drm/nouveau/nouveau_bios.c | |
| parent | 97a7810f7a23e4105db7222e7f4a5cdccc58237a (diff) | |
| download | nouveau-d339db83b993c89c77c6ab85a6139e4bcd330c77.tar.gz | |
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 'drm/nouveau/nouveau_bios.c')
| -rw-r--r-- | drm/nouveau/nouveau_bios.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/nouveau/nouveau_bios.c b/drm/nouveau/nouveau_bios.c index 7df6acc8b..8058b68b0 100644 --- a/drm/nouveau/nouveau_bios.c +++ b/drm/nouveau/nouveau_bios.c @@ -2009,7 +2009,7 @@ uint8_t *nouveau_bios_embedded_edid(struct drm_device *dev) static bool NVInitVBIOS(struct drm_device *dev) { 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 *legacy = &drm->vbios; memset(legacy, 0, sizeof(struct nvbios)); |