diff options
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/mga.h | 2 | ||||
| -rw-r--r-- | shared/mga_dma.c | 2 | ||||
| -rw-r--r-- | shared/mga_irq.c | 2 | ||||
| -rw-r--r-- | shared/r128.h | 2 | ||||
| -rw-r--r-- | shared/r128_cce.c | 2 | ||||
| -rw-r--r-- | shared/r128_irq.c | 2 | ||||
| -rw-r--r-- | shared/radeon.h | 2 | ||||
| -rw-r--r-- | shared/radeon_cp.c | 2 | ||||
| -rw-r--r-- | shared/radeon_irq.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/shared/mga.h b/shared/mga.h index 696a3b59..05fa9eb7 100644 --- a/shared/mga.h +++ b/shared/mga.h @@ -84,7 +84,7 @@ /* DMA customization: */ #define __HAVE_DMA 1 -#define __HAVE_DMA_IRQ 1 +#define __HAVE_IRQ 1 #define __HAVE_VBL_IRQ 1 #define __HAVE_SHARED_IRQ 1 diff --git a/shared/mga_dma.c b/shared/mga_dma.c index bfaee0d8..f2d92f15 100644 --- a/shared/mga_dma.c +++ b/shared/mga_dma.c @@ -639,7 +639,7 @@ int mga_do_cleanup_dma( drm_device_t *dev ) { DRM_DEBUG( "\n" ); -#if _HAVE_DMA_IRQ +#if __HAVE_IRQ /* Make sure interrupts are disabled here because the uninstall ioctl * may not have been called from userspace and after dev_private * is freed, it's too late. diff --git a/shared/mga_irq.c b/shared/mga_irq.c index ccced64f..e486618b 100644 --- a/shared/mga_irq.c +++ b/shared/mga_irq.c @@ -36,7 +36,7 @@ #include "mga_drm.h" #include "mga_drv.h" -irqreturn_t mga_dma_service( DRM_IRQ_ARGS ) +irqreturn_t mga_irq_handler( DRM_IRQ_ARGS ) { drm_device_t *dev = (drm_device_t *) arg; drm_mga_private_t *dev_priv = diff --git a/shared/r128.h b/shared/r128.h index 2047e4a4..97784fd1 100644 --- a/shared/r128.h +++ b/shared/r128.h @@ -117,7 +117,7 @@ /* DMA customization: */ #define __HAVE_DMA 1 -#define __HAVE_DMA_IRQ 1 +#define __HAVE_IRQ 1 #define __HAVE_VBL_IRQ 1 #define __HAVE_SHARED_IRQ 1 diff --git a/shared/r128_cce.c b/shared/r128_cce.c index 13b44a5c..fdf220bd 100644 --- a/shared/r128_cce.c +++ b/shared/r128_cce.c @@ -594,7 +594,7 @@ static int r128_do_init_cce( drm_device_t *dev, drm_r128_init_t *init ) int r128_do_cleanup_cce( drm_device_t *dev ) { -#if _HAVE_DMA_IRQ +#if __HAVE_IRQ /* Make sure interrupts are disabled here because the uninstall ioctl * may not have been called from userspace and after dev_private * is freed, it's too late. diff --git a/shared/r128_irq.c b/shared/r128_irq.c index c060e187..e77a5538 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_dma_service( DRM_IRQ_ARGS ) +irqreturn_t r128_irq_handler( DRM_IRQ_ARGS ) { drm_device_t *dev = (drm_device_t *) arg; drm_r128_private_t *dev_priv = diff --git a/shared/radeon.h b/shared/radeon.h index e66c11f7..fadb248b 100644 --- a/shared/radeon.h +++ b/shared/radeon.h @@ -179,7 +179,7 @@ do { \ /* DMA customization: */ #define __HAVE_DMA 1 -#define __HAVE_DMA_IRQ 1 +#define __HAVE_IRQ 1 #define __HAVE_VBL_IRQ 1 #define __HAVE_SHARED_IRQ 1 diff --git a/shared/radeon_cp.c b/shared/radeon_cp.c index 3e3618e3..b24880a8 100644 --- a/shared/radeon_cp.c +++ b/shared/radeon_cp.c @@ -1271,7 +1271,7 @@ int radeon_do_cleanup_cp( drm_device_t *dev ) { DRM_DEBUG( "\n" ); -#if _HAVE_DMA_IRQ +#if __HAVE_IRQ /* Make sure interrupts are disabled here because the uninstall ioctl * may not have been called from userspace and after dev_private * is freed, it's too late. diff --git a/shared/radeon_irq.c b/shared/radeon_irq.c index 1d339f28..f503153a 100644 --- a/shared/radeon_irq.c +++ b/shared/radeon_irq.c @@ -54,7 +54,7 @@ * tied to dma at all, this is just a hangover from dri prehistory. */ -irqreturn_t DRM(dma_service)( DRM_IRQ_ARGS ) +irqreturn_t DRM(irq_handler)( DRM_IRQ_ARGS ) { drm_device_t *dev = (drm_device_t *) arg; drm_radeon_private_t *dev_priv = |