diff options
author | Dave Airlie <airlied@redhat.com> | 2010-08-02 02:05:18 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-08-02 02:05:24 +0200 |
commit | d656ae53f64cb0f01dac8a02c4d31453d64ef97c (patch) | |
tree | cf641d4e5828b8f7c430b42657237c5daf9571fd /drivers/gpu/drm/radeon/radeon.h | |
parent | drm: radeon: fix sign bug (diff) | |
parent | Linux 2.6.35-rc6 (diff) | |
download | linux-d656ae53f64cb0f01dac8a02c4d31453d64ef97c.tar.xz linux-d656ae53f64cb0f01dac8a02c4d31453d64ef97c.zip |
Merge tag 'v2.6.35-rc6' into drm-radeon-next
Need this to avoid conflicts with future radeon fixes
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 966ba0751feb..c84f9a311550 100644 --- 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; + u64 gtt_base_align; }; bool radeon_combios_sideport_present(struct radeon_device *rdev); |