projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next
[linux-block.git]
/
include
/
drm
/
ttm
/
ttm_bo_api.h
diff --git
a/include/drm/ttm/ttm_bo_api.h
b/include/drm/ttm/ttm_bo_api.h
index a6ec6101d9ecc29c7a59545de714e219d42f4b2a..b1c705a935179ac0d1e4359e4f12500cf732d05c 100644
(file)
--- a/
include/drm/ttm/ttm_bo_api.h
+++ b/
include/drm/ttm/ttm_bo_api.h
@@
-666,10
+666,6
@@
int ttm_bo_mmap_obj(struct vm_area_struct *vma, struct ttm_buffer_object *bo);
int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,
struct ttm_bo_device *bdev);
-void *ttm_kmap_atomic_prot(struct page *page, pgprot_t prot);
-
-void ttm_kunmap_atomic_prot(void *addr, pgprot_t prot);
-
/**
* ttm_bo_io
*