diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-09 09:55:15 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-09 09:55:15 +1000 |
commit | 1ec558dd437664d8dd0f7a211dc95cc3f8eb9130 (patch) | |
tree | 150aea9e4b3eddc78d1d9a5522848438d7c08b30 /include/uapi | |
parent | 562652efa6ecfc5441adc60491a2d9f85043b9b3 (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. |