diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 21:22:57 +0400 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 21:31:41 +0400 |
| commit | 4fd69331ad227a4d8de26592d017b73e00caca9f (patch) | |
| tree | bfd95ed518ff0cb44318715432d321a92a7b9a0c /include/drm/ttm/ttm_page_alloc.h | |
| parent | 69e608411473ac56358ef35277563982d0565381 (diff) | |
| parent | 0ac09f9f8cd1fb028a48330edba6023d347d3cea (diff) | |
| download | linux-4fd69331ad227a4d8de26592d017b73e00caca9f.tar.xz | |
Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo
Conflicts:
arch/x86/include/asm/efi.h
Diffstat (limited to 'include/drm/ttm/ttm_page_alloc.h')
| -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 @@ #include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_memory.h> +struct device; + /** * Initialize pool allocator. */ |