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 /shared-core/i915_drm.h | |
| 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 'shared-core/i915_drm.h')
| -rw-r--r-- | shared-core/i915_drm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h index a8e09e72..4712ea4f 100644 --- a/shared-core/i915_drm.h +++ b/shared-core/i915_drm.h @@ -389,6 +389,7 @@ struct drm_i915_op_arg { uint64_t next; uint64_t reloc_ptr; int handled; + unsigned int pad64; union { struct drm_bo_op_req req; struct drm_bo_arg_rep rep; |