diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-12-11 16:58:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-12-11 16:58:00 +1000 |
| commit | 8d2da202337300e821f4867cb2654b41ff6053b6 (patch) | |
| tree | c7b0c4644c99180081eaa3f2e4bf0d1b4f8bbd63 /shared-core/drm.h | |
| parent | f99dea7db00dd46aa96eaed3a61dff9c956fd86f (diff) | |
| parent | cfa21b22b43c7113107b5eb086b5f4d4ec36dc0a (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
linux-core/drm_drv.c
shared-core/drm.h
shared-core/i915_dma.c
Diffstat (limited to 'shared-core/drm.h')
| -rw-r--r-- | shared-core/drm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h index f13e36c9..9186b64b 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -250,7 +250,7 @@ enum drm_map_flags { _DRM_WRITE_COMBINING = 0x10, /**< use write-combining if available */ _DRM_CONTAINS_LOCK = 0x20, /**< SHM page that contains lock */ _DRM_REMOVABLE = 0x40, /**< Removable mapping */ - _DRM_DRIVER = 0x80 /**< Driver will take care of it */ + _DRM_DRIVER = 0x80 /**< Managed by driver */ }; struct drm_ctx_priv_map { |