diff options
| author | Dave Airlie <airlied@nx6125b.(none)> | 2007-06-05 10:09:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@nx6125b.(none)> | 2007-06-05 10:09:11 +1000 |
| commit | 07345af838a7443d29d12cb3fe91614e43c4fa81 (patch) | |
| tree | 9a16e9ea79c70c6aea65ac11e395dfbf83459453 /linux-core/i915_buffer.c | |
| parent | 704ca0638977f58742a8bff6aba9905fe862cfb3 (diff) | |
| parent | 4327d7f3142cdbf3f3f94426ae33e2d30b5a40c8 (diff) | |
Merge branch 'origin' into radeon-ttm
Conflicts:
shared-core/radeon_drv.h
Diffstat (limited to 'linux-core/i915_buffer.c')
| -rw-r--r-- | linux-core/i915_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/i915_buffer.c b/linux-core/i915_buffer.c index 8797de89..8589f467 100644 --- a/linux-core/i915_buffer.c +++ b/linux-core/i915_buffer.c @@ -35,7 +35,7 @@ drm_ttm_backend_t *i915_create_ttm_backend_entry(drm_device_t * dev) { - return drm_agp_init_ttm(dev, NULL); + return drm_agp_init_ttm(dev); } int i915_fence_types(drm_buffer_object_t *bo, uint32_t * class, uint32_t * type) |