From 04a39c577f4114a3f098ee8ef0e20f7778b5ddad Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 24 Feb 2010 10:03:05 +1000 Subject: drm/nouveau: merge nvbios and nouveau_bios_info Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/nouveau_bios.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/drm/nouveau/nouveau_bios.h') diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h index 449a5f3d47d0..38c856fae141 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.h +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h @@ -186,18 +186,15 @@ struct pll_lims { int refclk; }; -struct nouveau_bios_info { +struct nvbios { + struct drm_device *dev; + uint8_t chip_version; uint32_t dactestval; uint32_t tvdactestval; uint8_t digital_min_front_porch; bool fp_no_ddc; -}; - -struct nvbios { - struct drm_device *dev; - struct nouveau_bios_info pub; struct mutex lock; -- cgit v1.2.3