diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-03 10:40:28 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-03 10:40:28 +1000 |
commit | c0a06fc9102a3c9da89b3eecb28c6f2d5b1f89f9 (patch) | |
tree | 6853f3b339327186bc3db7cb008f6d35f8b003a2 /include/uapi | |
parent | c26cb576661ac82c0131ee6e8d7e2371f07979b6 (diff) | |
parent | 4e3d1e26c2b2c40ebff69f2825fa862bfcf082d1 (diff) |
Merge remote-tracking branch 'drm-intel/for-linux-next'
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/drm/i915_drm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index dbd16a2d37db..fd5aa47bd689 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -358,7 +358,7 @@ typedef struct drm_i915_irq_wait { #define I915_PARAM_HAS_RESOURCE_STREAMER 36 typedef struct drm_i915_getparam { - s32 param; + __s32 param; /* * WARNING: Using pointers instead of fixed-size u64 means we need to write * compat32 code. Don't repeat this mistake. |