diff --git a/[refs] b/[refs] index 299ad28f44ca..0173a53a3467 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0109fd37046de64e8459f8c4f4706df9ac7cc82c +refs/heads/master: f179bc77d09b9087bfc559d0368bba350342ac76 diff --git a/trunk/drivers/char/drm/i915_drv.h b/trunk/drivers/char/drm/i915_drv.h index e58bdac16407..9c37d2367dd5 100644 --- a/trunk/drivers/char/drm/i915_drv.h +++ b/trunk/drivers/char/drm/i915_drv.h @@ -121,7 +121,7 @@ extern void i915_mem_release(drm_device_t * dev, DRMFILE filp, struct mem_block *heap); extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, - unsigned long arg) + unsigned long arg); #define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, reg)