summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2003-04-26 21:22:08 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2003-04-26 21:22:08 +0000
commit2c40a56393102bb0fb21e183bf5a08b0eea35c57 (patch)
treeaa8ae09607fa5d34b20e890acb54fb2b55c7fe05
parent2142b7840a5e0c2b6342ef94f285ac9fcf4a87ce (diff)
move prototypes for gamma functions to gamma_drv.h
-rw-r--r--linux-core/drmP.h6
-rw-r--r--linux/drmP.h6
-rw-r--r--linux/gamma_drv.h9
3 files changed, 9 insertions, 12 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index a4751f37..43d3776f 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -765,12 +765,6 @@ extern int DRM(lock_transfer)(drm_device_t *dev,
extern int DRM(lock_free)(drm_device_t *dev,
__volatile__ unsigned int *lock,
unsigned int context);
-extern int DRM(finish)(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern int DRM(flush_unblock)(drm_device_t *dev, int context,
- drm_lock_flags_t flags);
-extern int DRM(flush_block_and_flush)(drm_device_t *dev, int context,
- drm_lock_flags_t flags);
extern int DRM(notifier)(void *priv);
/* Buffer management support (drm_bufs.h) */
diff --git a/linux/drmP.h b/linux/drmP.h
index a4751f37..43d3776f 100644
--- a/linux/drmP.h
+++ b/linux/drmP.h
@@ -765,12 +765,6 @@ extern int DRM(lock_transfer)(drm_device_t *dev,
extern int DRM(lock_free)(drm_device_t *dev,
__volatile__ unsigned int *lock,
unsigned int context);
-extern int DRM(finish)(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern int DRM(flush_unblock)(drm_device_t *dev, int context,
- drm_lock_flags_t flags);
-extern int DRM(flush_block_and_flush)(drm_device_t *dev, int context,
- drm_lock_flags_t flags);
extern int DRM(notifier)(void *priv);
/* Buffer management support (drm_bufs.h) */
diff --git a/linux/gamma_drv.h b/linux/gamma_drv.h
index 3e0e3e65..fc91993f 100644
--- a/linux/gamma_drv.h
+++ b/linux/gamma_drv.h
@@ -60,6 +60,15 @@ extern int gamma_dma(struct inode *inode, struct file *filp,
extern int gamma_find_devices(void);
extern int gamma_found(void);
+/* Gamma-specific code pulled from drm_fops.h:
+ */
+extern int DRM(finish)(struct inode *inode, struct file *filp,
+ unsigned int cmd, unsigned long arg);
+extern int DRM(flush_unblock)(drm_device_t *dev, int context,
+ drm_lock_flags_t flags);
+extern int DRM(flush_block_and_flush)(drm_device_t *dev, int context,
+ drm_lock_flags_t flags);
+
/* Gamma-specific code pulled from drm_dma.h:
*/
extern void DRM(clear_next_buffer)(drm_device_t *dev);