diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-04-21 18:32:51 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-04-21 18:32:51 -0400 |
| commit | 49047962ecf02d76bdaa378c00a51c9b829ac195 (patch) | |
| tree | 4e711bead6598486b033c4d2dbdb7f7c0dd6f23a /include/drm | |
| parent | d57d47735ef5461952ef1dbdd515ebc0ffc5d2cc (diff) | |
| parent | bf16200689118d19de1b8d2a3c314fc21f5dc7bb (diff) | |
Merge tag 'v4.6-rc3' into drm-next
Backmerge 4.6-rc3 for i915.
Linux 4.6-rc3
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/ttm/ttm_bo_api.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index afae2316bd43..055a08ddac02 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h | |||
| @@ -92,7 +92,7 @@ struct ttm_placement { | |||
| 92 | */ | 92 | */ |
| 93 | struct ttm_bus_placement { | 93 | struct ttm_bus_placement { |
| 94 | void *addr; | 94 | void *addr; |
| 95 | unsigned long base; | 95 | phys_addr_t base; |
| 96 | unsigned long size; | 96 | unsigned long size; |
| 97 | unsigned long offset; | 97 | unsigned long offset; |
| 98 | bool is_iomem; | 98 | bool is_iomem; |