diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-02-09 16:47:31 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-02-09 16:47:31 +0100 |
| commit | 367bdc28e2de747c962659517bcc8cbf09a9fd81 (patch) | |
| tree | aa2516ad541e8eb43740fd45de6816edc30ed848 /lib/libdrm/intel/intel_bufmgr_gem.c | |
| parent | 91bb789ad557ceffb3635adba7a8222a2aab2ec8 (diff) | |
| parent | 13179665ebbd91ceeeeada784764303924d55696 (diff) | |
Merge remote-tracking branch 'origin/master' into matthieu/xserver-1.13
Diffstat (limited to 'lib/libdrm/intel/intel_bufmgr_gem.c')
| -rw-r--r-- | lib/libdrm/intel/intel_bufmgr_gem.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/libdrm/intel/intel_bufmgr_gem.c b/lib/libdrm/intel/intel_bufmgr_gem.c index 6f2ea53bd..7cc34e7e8 100644 --- a/lib/libdrm/intel/intel_bufmgr_gem.c +++ b/lib/libdrm/intel/intel_bufmgr_gem.c @@ -1328,7 +1328,6 @@ drm_intel_gem_bo_subdata(drm_intel_bo *bo, unsigned long offset, static int drm_intel_gem_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, int crtc_id) { -#ifndef __OpenBSD__ drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bufmgr; struct drm_i915_get_pipe_from_crtc_id get_pipe_from_crtc_id; int ret; @@ -1348,9 +1347,6 @@ drm_intel_gem_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, int crtc_id) } return get_pipe_from_crtc_id.pipe; -#endif - /* only needed for KMS */ - return -1; } static int |