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/i915_irq.c | |
| parent | eac498baeaf9b57b448065b0fb9f4eeadbb9aa6b (diff) | |
Merged drmfntbl-0-0-2drmfntbl-0-0-2-20040824-merge
Diffstat (limited to 'shared-core/i915_irq.c')
| -rw-r--r-- | shared-core/i915_irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c index e37da827..96c7e0f5 100644 --- a/shared-core/i915_irq.c +++ b/shared-core/i915_irq.c @@ -19,7 +19,7 @@ #define READ_BREADCRUMB(dev_priv) (((u32*)(dev_priv->hw_status_page))[5]) -irqreturn_t DRM(irq_handler)( DRM_IRQ_ARGS ) +irqreturn_t i915_driver_irq_handler( DRM_IRQ_ARGS ) { drm_device_t *dev = (drm_device_t *)arg; drm_i915_private_t *dev_priv = (drm_i915_private_t *)dev->dev_private; @@ -144,7 +144,7 @@ int i915_irq_wait( DRM_IOCTL_ARGS ) /* drm_dma.h hooks */ -void DRM(driver_irq_preinstall)( drm_device_t *dev ) { +void i915_driver_irq_preinstall( drm_device_t *dev ) { drm_i915_private_t *dev_priv = (drm_i915_private_t *)dev->dev_private; @@ -153,7 +153,7 @@ void DRM(driver_irq_preinstall)( drm_device_t *dev ) { I915_WRITE16( I915REG_INT_ENABLE_R, 0x0 ); } -void DRM(driver_irq_postinstall)( drm_device_t *dev ) { +void i915_driver_irq_postinstall( drm_device_t *dev ) { drm_i915_private_t *dev_priv = (drm_i915_private_t *)dev->dev_private; @@ -161,7 +161,7 @@ void DRM(driver_irq_postinstall)( drm_device_t *dev ) { DRM_INIT_WAITQUEUE(&dev_priv->irq_queue); } -void DRM(driver_irq_uninstall)( drm_device_t *dev ) { +void i915_driver_irq_uninstall( drm_device_t *dev ) { drm_i915_private_t *dev_priv = (drm_i915_private_t *)dev->dev_private; if (!dev_priv) |