diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-02-24 10:03:05 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-02-25 15:09:21 +1000 |
| commit | 04a39c577f4114a3f098ee8ef0e20f7778b5ddad (patch) | |
| tree | 681d13d2a73c86a293a0ad6fa9d5e6ef4a5fd42e /drivers/gpu/drm/nouveau/nouveau_drv.h | |
| parent | 7f245b20e30515264b94f6373ef7d721155990a4 (diff) | |
| download | linux-04a39c577f4114a3f098ee8ef0e20f7778b5ddad.tar.bz2 | |
drm/nouveau: merge nvbios and nouveau_bios_info
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index a33423622860..6fa9c87083c0 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -605,8 +605,7 @@ struct drm_nouveau_private { struct list_head gpuobj_list; - struct nvbios VBIOS; - struct nouveau_bios_info *vbios; + struct nvbios vbios; struct nv04_mode_state mode_reg; struct nv04_mode_state saved_reg; |