projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mac80211-for-davem-2016-06-29-v2' of git://git.kernel.org/pub/scm/linux...
[linux-2.6-block.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 d8d295ee7c12d7c1106c97683526060bc78d8354..a10bb3deee5417a0481014d019a046c6d2b15c19 100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_object.h
+++ b/
drivers/gpu/drm/radeon/radeon_object.h
@@
-65,7
+65,7
@@
static inline int radeon_bo_reserve(struct radeon_bo *bo, bool no_intr)
{
int r;
- r = ttm_bo_reserve(&bo->tbo, !no_intr, false,
false,
NULL);
+ r = ttm_bo_reserve(&bo->tbo, !no_intr, false, NULL);
if (unlikely(r != 0)) {
if (r != -ERESTARTSYS)
dev_err(bo->rdev->dev, "%p reserve failed\n", bo);