diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-04-22 08:32:51 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-04-22 08:32:51 +1000 |
| commit | 49047962ecf02d76bdaa378c00a51c9b829ac195 (patch) | |
| tree | 4e711bead6598486b033c4d2dbdb7f7c0dd6f23a /include/drm/ttm | |
| parent | d57d47735ef5461952ef1dbdd515ebc0ffc5d2cc (diff) | |
| parent | bf16200689118d19de1b8d2a3c314fc21f5dc7bb (diff) | |
| download | linux-49047962ecf02d76bdaa378c00a51c9b829ac195.tar.gz linux-49047962ecf02d76bdaa378c00a51c9b829ac195.tar.bz2 linux-49047962ecf02d76bdaa378c00a51c9b829ac195.zip | |
Merge tag 'v4.6-rc3' into drm-next
Backmerge 4.6-rc3 for i915.
Linux 4.6-rc3
Diffstat (limited to 'include/drm/ttm')
| -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 { */ struct ttm_bus_placement { void *addr; - unsigned long base; + phys_addr_t base; unsigned long size; unsigned long offset; bool is_iomem; |