diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-01 01:08:57 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-01 01:08:57 -0500 |
| commit | 68de7745822f0dc2eea940e3c1fc65896d7afc88 (patch) | |
| tree | 8ee06f4ee466b58fc224a7d447dd90a1168896e0 /include/drm | |
| parent | cf7934a2a0ec55759fcf6861a868baadfd522300 (diff) | |
| parent | 566d84d172161cb6c0c4dd834c34abbac6bf7b38 (diff) | |
Merge branch 'drm-radeon-testing' of /ssd/git/drm-radeon-next into drm-next-stage
* 'drm-radeon-testing' of /ssd/git/drm-radeon-next:
drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond
drm/ttm: fix function prototype to match implementation
drm/radeon: use ALIGN instead of open coding it
drm/radeon/kms: initialize set_surface_reg reg for rs600 asic
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 4c4e0f8375b3..e3f1b4a4b601 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h | |||
| @@ -908,7 +908,7 @@ extern int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, | |||
| 908 | * Utility function that returns the pgprot_t that should be used for | 908 | * Utility function that returns the pgprot_t that should be used for |
| 909 | * setting up a PTE with the caching model indicated by @c_state. | 909 | * setting up a PTE with the caching model indicated by @c_state. |
| 910 | */ | 910 | */ |
| 911 | extern pgprot_t ttm_io_prot(enum ttm_caching_state c_state, pgprot_t tmp); | 911 | extern pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp); |
| 912 | 912 | ||
| 913 | #if (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))) | 913 | #if (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))) |
| 914 | #define TTM_HAS_AGP | 914 | #define TTM_HAS_AGP |