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 'for-linus-20160523' of git://git.infradead.org/linux-mtd
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
mgag200
/
mgag200_drv.h
diff --git
a/drivers/gpu/drm/mgag200/mgag200_drv.h
b/drivers/gpu/drm/mgag200/mgag200_drv.h
index 205b2801d3b8674932c7781b8a714ae193abe098..3e02ac20777ce82fdf40b632ef8648064eb1a2dc 100644
(file)
--- a/
drivers/gpu/drm/mgag200/mgag200_drv.h
+++ b/
drivers/gpu/drm/mgag200/mgag200_drv.h
@@
-281,7
+281,7
@@
static inline int mgag200_bo_reserve(struct mgag200_bo *bo, bool no_wait)
{
int ret;
- ret = ttm_bo_reserve(&bo->bo, true, no_wait,
false,
NULL);
+ ret = ttm_bo_reserve(&bo->bo, true, no_wait, NULL);
if (ret) {
if (ret != -ERESTARTSYS && ret != -EBUSY)
DRM_ERROR("reserve failed %p\n", bo);