diff options
| author | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
| commit | 461bfa3da6f85b85c21cd84f81bb4eefa5481418 (patch) | |
| tree | 33e91c8cd024f67922670f9ed6565ceda1e4f3b5 /bsd-core/drm_memory.c | |
| parent | 50bce2bc625deb439dd61f504496dddd0cd4f572 (diff) | |
| parent | 6e8a2cff66ac0d6afaf9bb233bc81449c2014078 (diff) | |
Merge commit 'origin/master' into drm-gem
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_drv.h
shared-core/nouveau_state.c
Diffstat (limited to 'bsd-core/drm_memory.c')
| -rw-r--r-- | bsd-core/drm_memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bsd-core/drm_memory.c b/bsd-core/drm_memory.c index 1f1f7f4b..05343f3f 100644 --- a/bsd-core/drm_memory.c +++ b/bsd-core/drm_memory.c @@ -80,7 +80,7 @@ void drm_free(void *pt, size_t size, int area) free(pt, M_DRM); } -void *drm_ioremap(drm_device_t *dev, drm_local_map_t *map) +void *drm_ioremap(struct drm_device *dev, drm_local_map_t *map) { #ifdef __FreeBSD__ return pmap_mapdev(map->offset, map->size); |