summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie2006-10-24 20:36:59 +0200
committerairlied2006-12-07 05:53:31 +0100
commit5c2df2bfb121a77d925dba580f53da08b4020528 (patch)
treeb94af6d61c8f4210a8b7b563d7a42f887b61651b
parentdrm: i915 updates (diff)
downloadkernel-qcow2-linux-5c2df2bfb121a77d925dba580f53da08b4020528.tar.gz
kernel-qcow2-linux-5c2df2bfb121a77d925dba580f53da08b4020528.tar.xz
kernel-qcow2-linux-5c2df2bfb121a77d925dba580f53da08b4020528.zip
drm: fix up irqflags in drm_lock.c
Signed-off-by: Dave Airlie <airlied@linux.ie>
-rw-r--r--drivers/char/drm/drm_lock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c
index e0abe5c68423..116ed0f2ac09 100644
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
@@ -155,7 +155,7 @@ int drm_unlock(struct inode *inode, struct file *filp,
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->head->dev;
drm_lock_t lock;
- unsigned int irqflags;
+ unsigned long irqflags;
if (copy_from_user(&lock, (drm_lock_t __user *) arg, sizeof(lock)))
return -EFAULT;