diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-11-22 17:17:06 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-11-22 17:17:06 +1100 |
| commit | a20587e3950f849deb1e723a0b4455a19f7b3fb8 (patch) | |
| tree | de0a9d0b6558f3b359acf7985ddf4b8e7e83ee24 /shared-core/via_verifier.c | |
| parent | 8fd8bf599b42b6caa062afabdfce7385d59a7695 (diff) | |
| parent | 5dc5c36e624e5393b5427a159ad34e5fc358cc9f (diff) | |
Merge branch 'origin' into modesetting-101
Conflicts:
linux-core/drmP.h
shared-core/i915_dma.c
shared-core/i915_drm.h
shared-core/radeon_drv.h
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; |