diff options
author | Dave Airlie <airlied@linux.ie> | 2007-12-10 15:53:59 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2007-12-10 15:53:59 +1000 |
commit | 814f695135f21aadeba77a3114df505d81a8d433 (patch) | |
tree | 277da7e1c5dce9318591158435d2e367f3e495d3 /shared-core/via_verifier.c | |
parent | e51b3c8ff4bb88bc0f57473b7c3fe7fcd6b1a916 (diff) | |
parent | cfa21b22b43c7113107b5eb086b5f4d4ec36dc0a (diff) |
Merge branch 'master' into r500-support
Diffstat (limited to 'shared-core/via_verifier.c')
-rw-r--r-- | shared-core/via_verifier.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/via_verifier.c b/shared-core/via_verifier.c index cfacd0ca..d2b69f74 100644 --- a/shared-core/via_verifier.c +++ b/shared-core/via_verifier.c @@ -249,10 +249,10 @@ eat_words(const uint32_t ** buf, const uint32_t * buf_end, unsigned num_words) * Partially stolen from drm_memory.h */ -static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t * seq, +static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq, unsigned long offset, unsigned long size, - struct drm_device * dev) + struct drm_device *dev) { #ifdef __linux__ struct drm_map_list *r_list; |