projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
bochs
/
bochs_mm.c
diff --git
a/drivers/gpu/drm/bochs/bochs_mm.c
b/drivers/gpu/drm/bochs/bochs_mm.c
index 324f5a09a0a119bf1f1b6d8dd59d2838f47efe82..66286ff518d4be28e8b71b2b8ebf0d0b2ada6496 100644
(file)
--- a/
drivers/gpu/drm/bochs/bochs_mm.c
+++ b/
drivers/gpu/drm/bochs/bochs_mm.c
@@
-377,7
+377,7
@@
static int bochs_bo_create(struct drm_device *dev, int size, int align,
ret = ttm_bo_init(&bochs->ttm.bdev, &bochsbo->bo, size,
ttm_bo_type_device, &bochsbo->placement,
align >> PAGE_SHIFT, false, NULL, acc_size,
- NULL, bochs_bo_ttm_destroy);
+ NULL,
NULL,
bochs_bo_ttm_destroy);
if (ret)
return ret;