diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 12:59:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 12:59:23 -0400 |
| commit | 0109fd37046de64e8459f8c4f4706df9ac7cc82c (patch) | |
| tree | 18dcdb43cc8c6cd494375f8af919024889d24d87 /drivers/char/drm/i915_irq.c | |
| parent | cc14cf46da215a9df1c0a4388763a68769ef9e53 (diff) | |
| parent | 850eb83a6a21b086624b227653ce90ad927ba423 (diff) | |
Merge head 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'drivers/char/drm/i915_irq.c')
| -rw-r--r-- | drivers/char/drm/i915_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c index a101cc9cfd7e..4fa448ee846b 100644 --- a/drivers/char/drm/i915_irq.c +++ b/drivers/char/drm/i915_irq.c | |||
| @@ -56,7 +56,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) | |||
| 56 | return IRQ_HANDLED; | 56 | return IRQ_HANDLED; |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | int i915_emit_irq(drm_device_t * dev) | 59 | static int i915_emit_irq(drm_device_t * dev) |
| 60 | { | 60 | { |
| 61 | drm_i915_private_t *dev_priv = dev->dev_private; | 61 | drm_i915_private_t *dev_priv = dev->dev_private; |
| 62 | u32 ret; | 62 | u32 ret; |
| @@ -76,7 +76,7 @@ int i915_emit_irq(drm_device_t * dev) | |||
| 76 | return ret; | 76 | return ret; |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | int i915_wait_irq(drm_device_t * dev, int irq_nr) | 79 | static int i915_wait_irq(drm_device_t * dev, int irq_nr) |
| 80 | { | 80 | { |
| 81 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | 81 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |
| 82 | int ret = 0; | 82 | int ret = 0; |