Merge tag 'v2.6.35-rc6' into drm-radeon-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / radeon / radeon.h

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 966ba0751feb5f41b316dd81401920c6717f1e23..c84f9a311550ae7726709a8bd42258c5207e45cb 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -354,6 +354,7 @@ struct radeon_mc {
        int                     vram_mtrr;
        bool                    vram_is_ddr;
        bool                    igp_sideport_enabled;
        int                     vram_mtrr;
        bool                    vram_is_ddr;
        bool                    igp_sideport_enabled;

+       u64                     gtt_base_align;

 };
 
 bool radeon_combios_sideport_present(struct radeon_device *rdev);
 };
 
 bool radeon_combios_sideport_present(struct radeon_device *rdev);