diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-06-29 20:09:44 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-06-29 20:09:44 +0100 |
| commit | 8a78dead291ffdb5a8774419cdca369a1e27cad9 (patch) | |
| tree | 399b8378e32036bdc7dadc10c639465a8fb21681 /shared-core/mga_dma.c | |
| parent | e79e2a58161d44754fd55507e155b7e12a09c4d2 (diff) | |
| parent | a27af4c4a665864df09123f177ca7269e48f6171 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
linux-core/drm_drv.c
linux-core/drm_fops.c
linux-core/drm_objects.h
linux-core/drm_stub.c
shared-core/i915_dma.c
Diffstat (limited to 'shared-core/mga_dma.c')
| -rw-r--r-- | shared-core/mga_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-core/mga_dma.c b/shared-core/mga_dma.c index 78448282..d48313c7 100644 --- a/shared-core/mga_dma.c +++ b/shared-core/mga_dma.c @@ -551,7 +551,7 @@ static int mga_do_agp_dma_bootstrap(drm_device_t * dev, drm_map_list_t *_entry; unsigned long agp_token = 0; - list_for_each_entry(_entry, &dev->maplist->head, head) { + list_for_each_entry(_entry, &dev->maplist, head) { if (_entry->map == dev->agp_buffer_map) agp_token = _entry->user_token; } |