diff options
-rw-r--r-- | drivers/char/drm/i915_irq.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c index 40c55edfa2ee..1a5edec7e190 100644 --- a/drivers/char/drm/i915_irq.c +++ b/drivers/char/drm/i915_irq.c | |||
@@ -45,7 +45,7 @@ | |||
45 | static void i915_vblank_tasklet(drm_device_t *dev) | 45 | static void i915_vblank_tasklet(drm_device_t *dev) |
46 | { | 46 | { |
47 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | 47 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |
48 | unsigned int irqflags; | 48 | unsigned long irqflags; |
49 | struct list_head *list, *tmp; | 49 | struct list_head *list, *tmp; |
50 | 50 | ||
51 | DRM_DEBUG("\n"); | 51 | DRM_DEBUG("\n"); |
@@ -379,7 +379,8 @@ int i915_vblank_swap(DRM_IOCTL_ARGS) | |||
379 | drm_i915_private_t *dev_priv = dev->dev_private; | 379 | drm_i915_private_t *dev_priv = dev->dev_private; |
380 | drm_i915_vblank_swap_t swap; | 380 | drm_i915_vblank_swap_t swap; |
381 | drm_i915_vbl_swap_t *vbl_swap; | 381 | drm_i915_vbl_swap_t *vbl_swap; |
382 | unsigned int pipe, seqtype, irqflags, curseq; | 382 | unsigned int pipe, seqtype, curseq; |
383 | unsigned long irqflags; | ||
383 | struct list_head *list; | 384 | struct list_head *list; |
384 | 385 | ||
385 | if (!dev_priv) { | 386 | if (!dev_priv) { |