diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-02-18 17:21:26 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-02-18 17:21:26 -0500 |
| commit | 75936c65dda54a08d9124f24f8725f86a4adc286 (patch) | |
| tree | 39e1a39f984bf450ee37a1ded6113d0b998b3a6d /include/drm | |
| parent | 9830e44f560de2f9f9453bb7f0eb2979b36ed139 (diff) | |
| parent | 7a444d1f0b557c68f847050b33713ae7b56f25e7 (diff) | |
Merge tag 'ttm-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux into drm-fixes
Pull request of 2014-02-18
One compile fix and one memory leak.
* tag 'ttm-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux:
drm/ttm: Fix memory leak in ttm_agp_backend.c
drm/ttm: declare 'struct device' in ttm_page_alloc.h
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/ttm/ttm_page_alloc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h index d1f61bfe0ebe..49a828425fa2 100644 --- a/include/drm/ttm/ttm_page_alloc.h +++ b/include/drm/ttm/ttm_page_alloc.h | |||
| @@ -29,6 +29,8 @@ | |||
| 29 | #include <drm/ttm/ttm_bo_driver.h> | 29 | #include <drm/ttm/ttm_bo_driver.h> |
| 30 | #include <drm/ttm/ttm_memory.h> | 30 | #include <drm/ttm/ttm_memory.h> |
| 31 | 31 | ||
| 32 | struct device; | ||
| 33 | |||
| 32 | /** | 34 | /** |
| 33 | * Initialize pool allocator. | 35 | * Initialize pool allocator. |
| 34 | */ | 36 | */ |