diff options
author | Dave Airlie <airlied@linux.ie> | 2004-08-24 11:15:53 +0000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2004-08-24 11:15:53 +0000 |
commit | d4dbf457813e97531ded3bf24f3b6ad421189c69 (patch) | |
tree | 8e47c1dd5d7cf9c8c4bce4a7e34531fc9a8eae75 /shared/r128_irq.c | |
parent | eac498baeaf9b57b448065b0fb9f4eeadbb9aa6b (diff) |
Merged drmfntbl-0-0-2
Diffstat (limited to 'shared/r128_irq.c')
-rw-r--r-- | shared/r128_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared/r128_irq.c b/shared/r128_irq.c index e77a5538..be1b9dac 100644 --- a/shared/r128_irq.c +++ b/shared/r128_irq.c @@ -36,7 +36,7 @@ #include "r128_drm.h" #include "r128_drv.h" -irqreturn_t r128_irq_handler( DRM_IRQ_ARGS ) +irqreturn_t r128_driver_irq_handler( DRM_IRQ_ARGS ) { drm_device_t *dev = (drm_device_t *) arg; drm_r128_private_t *dev_priv = @@ -56,7 +56,7 @@ irqreturn_t r128_irq_handler( DRM_IRQ_ARGS ) return IRQ_NONE; } -int DRM(vblank_wait)(drm_device_t *dev, unsigned int *sequence) +int r128_driver_vblank_wait(drm_device_t *dev, unsigned int *sequence) { unsigned int cur_vblank; int ret = 0; |