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

Need this to avoid conflicts with future radeon fixes
This commit is contained in:
Dave Airlie 2010-08-02 10:05:18 +10:00
commit d656ae53f6
597 changed files with 6200 additions and 198259 deletions

View file

@ -354,6 +354,7 @@ struct radeon_mc {
int vram_mtrr;
bool vram_is_ddr;
bool igp_sideport_enabled;
u64 gtt_base_align;
};
bool radeon_combios_sideport_present(struct radeon_device *rdev);