Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next

This commit is contained in:
Dave Airlie
2011-01-05 08:31:08 +10:00
656 changed files with 6383 additions and 4644 deletions

View File

@@ -245,7 +245,7 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev,
goto out_unref;
}
info->apertures->ranges[0].base = rdev->ddev->mode_config.fb_base;
info->apertures->ranges[0].size = rdev->mc.real_vram_size;
info->apertures->ranges[0].size = rdev->mc.aper_size;
info->pixmap.size = 64*1024;
info->pixmap.buf_align = 8;