diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /include/drm/ttm/ttm_bo_api.h | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'include/drm/ttm/ttm_bo_api.h')
| -rw-r--r-- | include/drm/ttm/ttm_bo_api.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index 62a0e4c4ceee..42e346985186 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h | |||
| @@ -662,9 +662,6 @@ extern int ttm_bo_kmap(struct ttm_buffer_object *bo, unsigned long start_page, | |||
| 662 | 662 | ||
| 663 | extern void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map); | 663 | extern void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map); |
| 664 | 664 | ||
| 665 | #if 0 | ||
| 666 | #endif | ||
| 667 | |||
| 668 | /** | 665 | /** |
| 669 | * ttm_fbdev_mmap - mmap fbdev memory backed by a ttm buffer object. | 666 | * ttm_fbdev_mmap - mmap fbdev memory backed by a ttm buffer object. |
| 670 | * | 667 | * |