summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-02-24 14:29:14 -0800
committerDave Airlie <airlied@redhat.com>2010-03-01 16:03:26 +1000
commita55e8d452ed2f6bbecda1a3039e82cd05244be3d (patch)
tree4865b9575e3d6c22b68b2df70eaec27c37f73b36
parentd964fc54ed06cea45dfd10832ed3d34f3ddb661b (diff)
downloadlinux-a55e8d452ed2f6bbecda1a3039e82cd05244be3d.tar.gz
linux-a55e8d452ed2f6bbecda1a3039e82cd05244be3d.tar.bz2
linux-a55e8d452ed2f6bbecda1a3039e82cd05244be3d.zip
drm/ttm: fix function prototype to match implementation
Fix function prototype to match its actual usage and implementation. drivers/gpu/drm/ttm/ttm_bo_util.c:341:10: error: symbol 'ttm_io_prot' redeclared with different type (originally declared at include/drm/ttm/ttm_bo_driver.h:911) - incompatible argument 1 (different signedness) Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: David Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--include/drm/ttm/ttm_bo_driver.h2
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,
* Utility function that returns the pgprot_t that should be used for
* setting up a PTE with the caching model indicated by @c_state.
*/
-extern pgprot_t ttm_io_prot(enum ttm_caching_state c_state, pgprot_t tmp);
+extern pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
#if (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE)))
#define TTM_HAS_AGP