aboutsummaryrefslogtreecommitdiff
path: root/linux/drmP.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2004-07-25 08:47:38 +0000
committerDave Airlie <airlied@linux.ie>2004-07-25 08:47:38 +0000
commit02df04d71d373f1f779ebfd5d383a704ebb397ee (patch)
tree1e58f7bfc78d0c99dc25981603e9fca0ed9a6859 /linux/drmP.h
parent1f132b7849c453d3aebd227866f743cbcf7f3881 (diff)
sync up with current 2.6 kernel bk tree - mostly __user annotations
Diffstat (limited to 'linux/drmP.h')
-rw-r--r--linux/drmP.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/linux/drmP.h b/linux/drmP.h
index 066b185d..23c6854c 100644
--- a/linux/drmP.h
+++ b/linux/drmP.h
@@ -558,7 +558,7 @@ typedef struct drm_ctx_list {
drm_file_t *tag; /**< associated fd private data */
} drm_ctx_list_t;
-#if __HAVE_VBL_IRQ
+#ifdef __HAVE_VBL_IRQ
typedef struct drm_vbl_sig {
struct list_head head;
@@ -661,7 +661,7 @@ typedef struct drm_device {
#endif
/** \name VBLANK IRQ support */
/*@{*/
-#if __HAVE_VBL_IRQ
+#ifdef __HAVE_VBL_IRQ
wait_queue_head_t vbl_queue; /**< VBLANK wait queue */
atomic_t vbl_received;
spinlock_t vbl_lock;
@@ -879,13 +879,13 @@ extern irqreturn_t DRM(irq_handler)( DRM_IRQ_ARGS );
extern void DRM(driver_irq_preinstall)( drm_device_t *dev );
extern void DRM(driver_irq_postinstall)( drm_device_t *dev );
extern void DRM(driver_irq_uninstall)( drm_device_t *dev );
-#if __HAVE_VBL_IRQ
+#ifdef __HAVE_VBL_IRQ
extern int DRM(wait_vblank)(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
extern int DRM(vblank_wait)(drm_device_t *dev, unsigned int *vbl_seq);
extern void DRM(vbl_send_signals)( drm_device_t *dev );
#endif
-#if __HAVE_IRQ_BH
+#ifdef __HAVE_IRQ_BH
extern void DRM(irq_immediate_bh)( void *dev );
#endif
#endif
@@ -933,7 +933,7 @@ extern int DRM(proc_cleanup)(int minor,
struct proc_dir_entry *root,
struct proc_dir_entry *dev_root);
-#if __HAVE_SG
+#ifdef __HAVE_SG
/* Scatter Gather Support (drm_scatter.h) */
extern void DRM(sg_cleanup)(drm_sg_mem_t *entry);
extern int DRM(sg_alloc)(struct inode *inode, struct file *filp,