From 1cffd8ae339b620f026c12fbd37d4e90a17a7002 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 23 May 2012 14:08:41 +0100 Subject: [PATCH] --- yaml --- r: 307509 b: refs/heads/master c: 5288b7b205ccd59ad40ef8ec270302bf94ac4697 h: refs/heads/master i: 307507: 986189106f7f69edbbb31ebfbe070205a3e82eae v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/ast/ast_ttm.c | 2 +- trunk/drivers/gpu/drm/cirrus/cirrus_ttm.c | 2 +- trunk/drivers/gpu/drm/mgag200/mgag200_ttm.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b8f88d64c702..87ab4f73b522 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b2ba70091c1bef1dfb3677db229dc5392dfec8c +refs/heads/master: 5288b7b205ccd59ad40ef8ec270302bf94ac4697 diff --git a/trunk/drivers/gpu/drm/ast/ast_ttm.c b/trunk/drivers/gpu/drm/ast/ast_ttm.c index aad12f747175..6cf2adea66bc 100644 --- a/trunk/drivers/gpu/drm/ast/ast_ttm.c +++ b/trunk/drivers/gpu/drm/ast/ast_ttm.c @@ -357,7 +357,7 @@ int ast_bo_create(struct drm_device *dev, int size, int align, ret = ttm_bo_init(&ast->ttm.bdev, &astbo->bo, size, ttm_bo_type_device, &astbo->placement, align >> PAGE_SHIFT, 0, false, NULL, acc_size, - ast_bo_ttm_destroy); + NULL, ast_bo_ttm_destroy); if (ret) return ret; diff --git a/trunk/drivers/gpu/drm/cirrus/cirrus_ttm.c b/trunk/drivers/gpu/drm/cirrus/cirrus_ttm.c index ae2f08ff3808..2ebcd11a5023 100644 --- a/trunk/drivers/gpu/drm/cirrus/cirrus_ttm.c +++ b/trunk/drivers/gpu/drm/cirrus/cirrus_ttm.c @@ -357,7 +357,7 @@ int cirrus_bo_create(struct drm_device *dev, int size, int align, ret = ttm_bo_init(&cirrus->ttm.bdev, &cirrusbo->bo, size, ttm_bo_type_device, &cirrusbo->placement, align >> PAGE_SHIFT, 0, false, NULL, acc_size, - cirrus_bo_ttm_destroy); + NULL, cirrus_bo_ttm_destroy); if (ret) return ret; diff --git a/trunk/drivers/gpu/drm/mgag200/mgag200_ttm.c b/trunk/drivers/gpu/drm/mgag200/mgag200_ttm.c index 12264793108f..b223dcb7a710 100644 --- a/trunk/drivers/gpu/drm/mgag200/mgag200_ttm.c +++ b/trunk/drivers/gpu/drm/mgag200/mgag200_ttm.c @@ -356,7 +356,7 @@ int mgag200_bo_create(struct drm_device *dev, int size, int align, ret = ttm_bo_init(&mdev->ttm.bdev, &mgabo->bo, size, ttm_bo_type_device, &mgabo->placement, align >> PAGE_SHIFT, 0, false, NULL, acc_size, - mgag200_bo_ttm_destroy); + NULL, mgag200_bo_ttm_destroy); if (ret) return ret;