Merge branch 'linus' into perf/urgent

[karo-tx-linux.git] / drivers / gpu / drm / radeon / radeon_object.h

diff --git a/drivers/gpu/drm/radeon/radeon_object.h b/drivers/gpu/drm/radeon/radeon_object.h
index befec7d12132a131e58bb54773f80914e9bca761..17fb99f177cf82f56cbb8d53fef0f5c642f930d7 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_object.h
+++ b/drivers/gpu/drm/radeon/radeon_object.h
@@ -111,9 +111,10 @@ extern int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type,
                          bool no_wait);
 
 extern int radeon_bo_create(struct radeon_device *rdev,
-                               unsigned long size, int byte_align,
-                               bool kernel, u32 domain,
-                               struct radeon_bo **bo_ptr);
+                           unsigned long size, int byte_align,
+                           bool kernel, u32 domain,
+                           struct sg_table *sg,
+                           struct radeon_bo **bo_ptr);
 extern int radeon_bo_kmap(struct radeon_bo *bo, void **ptr);
 extern void radeon_bo_kunmap(struct radeon_bo *bo);
 extern void radeon_bo_unref(struct radeon_bo **bo);