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-core/mach64_irq.c | |
| parent | eac498baeaf9b57b448065b0fb9f4eeadbb9aa6b (diff) | |
Merged drmfntbl-0-0-2
Diffstat (limited to 'shared-core/mach64_irq.c')
| -rw-r--r-- | shared-core/mach64_irq.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/shared-core/mach64_irq.c b/shared-core/mach64_irq.c index 9acd6269..efa0641f 100644 --- a/shared-core/mach64_irq.c +++ b/shared-core/mach64_irq.c @@ -40,7 +40,7 @@ #include "mach64_drm.h" #include "mach64_drv.h" -irqreturn_t DRM(irq_handler)( DRM_IRQ_ARGS ) +irqreturn_t mach64_driver_irq_handler( DRM_IRQ_ARGS ) { drm_device_t *dev = (drm_device_t *) arg; drm_mach64_private_t *dev_priv = @@ -69,7 +69,7 @@ irqreturn_t DRM(irq_handler)( DRM_IRQ_ARGS ) return IRQ_NONE; } -int DRM(vblank_wait)(drm_device_t *dev, unsigned int *sequence) +int mach64_driver_vblank_wait(drm_device_t *dev, unsigned int *sequence) { unsigned int cur_vblank; int ret = 0; @@ -89,7 +89,7 @@ int DRM(vblank_wait)(drm_device_t *dev, unsigned int *sequence) /* drm_dma.h hooks */ -void DRM(driver_irq_preinstall)( drm_device_t *dev ) { +void mach64_driver_irq_preinstall( drm_device_t *dev ) { drm_mach64_private_t *dev_priv = (drm_mach64_private_t *)dev->dev_private; @@ -102,7 +102,7 @@ void DRM(driver_irq_preinstall)( drm_device_t *dev ) { | MACH64_CRTC_VBLANK_INT ); } -void DRM(driver_irq_postinstall)( drm_device_t *dev ) { +void mach64_driver_irq_postinstall( drm_device_t *dev ) { drm_mach64_private_t *dev_priv = (drm_mach64_private_t *)dev->dev_private; @@ -114,7 +114,7 @@ void DRM(driver_irq_postinstall)( drm_device_t *dev ) { } -void DRM(driver_irq_uninstall)( drm_device_t *dev ) { +void mach64_driver_irq_uninstall( drm_device_t *dev ) { drm_mach64_private_t *dev_priv = (drm_mach64_private_t *)dev->dev_private; if ( !dev_priv ) |