diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-07-25 08:47:38 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-07-25 08:47:38 +0000 |
| commit | 02df04d71d373f1f779ebfd5d383a704ebb397ee (patch) | |
| tree | 1e58f7bfc78d0c99dc25981603e9fca0ed9a6859 /linux-core/drm_irq.c | |
| parent | 1f132b7849c453d3aebd227866f743cbcf7f3881 (diff) | |
sync up with current 2.6 kernel bk tree - mostly __user annotations
Diffstat (limited to 'linux-core/drm_irq.c')
| -rw-r--r-- | linux-core/drm_irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/drm_irq.c b/linux-core/drm_irq.c index 035eb70f..aac0b1b0 100644 --- a/linux-core/drm_irq.c +++ b/linux-core/drm_irq.c @@ -129,7 +129,7 @@ int DRM(irq_install)( drm_device_t *dev ) dev->dma->this_buffer = NULL; #endif -#if __HAVE_IRQ_BH +#ifdef __HAVE_IRQ_BH #if !HAS_WORKQUEUE INIT_LIST_HEAD( &dev->tq.list ); dev->tq.sync = 0; @@ -140,7 +140,7 @@ int DRM(irq_install)( drm_device_t *dev ) #endif #endif -#if __HAVE_VBL_IRQ +#ifdef __HAVE_VBL_IRQ init_waitqueue_head(&dev->vbl_queue); spin_lock_init( &dev->vbl_lock ); @@ -231,7 +231,7 @@ int DRM(control)( struct inode *inode, struct file *filp, } } -#if __HAVE_VBL_IRQ +#ifdef __HAVE_VBL_IRQ /** * Wait for VBLANK. |