summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
author=?utf-8?q?Michel_D=C3=A4nzer?= <michel@tungstengraphics.com>2006-10-25 00:12:52 +1000
committerairlied <airlied@linux.ie>2006-12-07 15:53:30 +1100
commita0b136bb696cfa744a79c4dbbbbd0c8f9f30fe3f (patch)
tree349ce779875243b11745acaf47e92d978aa088f0 /drivers
parent21fa60ed4eab5b3b28d05930bb086615ecc191b1 (diff)
downloadop-kernel-dev-a0b136bb696cfa744a79c4dbbbbd0c8f9f30fe3f.zip
op-kernel-dev-a0b136bb696cfa744a79c4dbbbbd0c8f9f30fe3f.tar.gz
drm: i915: fix up irqflags arg
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/drm/i915_irq.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index 40c55ed..1a5edec 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -45,7 +45,7 @@
static void i915_vblank_tasklet(drm_device_t *dev)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- unsigned int irqflags;
+ unsigned long irqflags;
struct list_head *list, *tmp;
DRM_DEBUG("\n");
@@ -379,7 +379,8 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
drm_i915_private_t *dev_priv = dev->dev_private;
drm_i915_vblank_swap_t swap;
drm_i915_vbl_swap_t *vbl_swap;
- unsigned int pipe, seqtype, irqflags, curseq;
+ unsigned int pipe, seqtype, curseq;
+ unsigned long irqflags;
struct list_head *list;
if (!dev_priv) {
OpenPOWER on IntegriCloud