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/i830_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/i830_irq.c')
| -rw-r--r-- | drivers/char/drm/i830_irq.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/drm/i830_irq.c b/drivers/char/drm/i830_irq.c index 6d7729ffe2dc..a5923e5d0a77 100644 --- a/drivers/char/drm/i830_irq.c +++ b/drivers/char/drm/i830_irq.c | |||
| @@ -54,8 +54,7 @@ irqreturn_t i830_driver_irq_handler( DRM_IRQ_ARGS ) | |||
| 54 | return IRQ_HANDLED; | 54 | return IRQ_HANDLED; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | 57 | static int i830_emit_irq(drm_device_t *dev) | |
| 58 | int i830_emit_irq(drm_device_t *dev) | ||
| 59 | { | 58 | { |
| 60 | drm_i830_private_t *dev_priv = dev->dev_private; | 59 | drm_i830_private_t *dev_priv = dev->dev_private; |
| 61 | RING_LOCALS; | 60 | RING_LOCALS; |
| @@ -73,7 +72,7 @@ int i830_emit_irq(drm_device_t *dev) | |||
| 73 | } | 72 | } |
| 74 | 73 | ||
| 75 | 74 | ||
| 76 | int i830_wait_irq(drm_device_t *dev, int irq_nr) | 75 | static int i830_wait_irq(drm_device_t *dev, int irq_nr) |
| 77 | { | 76 | { |
| 78 | drm_i830_private_t *dev_priv = | 77 | drm_i830_private_t *dev_priv = |
| 79 | (drm_i830_private_t *)dev->dev_private; | 78 | (drm_i830_private_t *)dev->dev_private; |