summaryrefslogtreecommitdiff
path: root/linux-core/drmP.h
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2003-04-22 12:07:24 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2003-04-22 12:07:24 +0000
commit928c25d14f76ff537bd56f135b91cf681dee326b (patch)
treece4692e70c1343a1ce763e208919aaedb87b199f /linux-core/drmP.h
parentaba6bf7eb3cd53137fab4424ff39e2d68b83dc2a (diff)
Move the excitingly named DRM(flush_block_and_flush) and friends to
gamma-specific code. Fix templates so i8x0 drivers don't have to define __HAVE_DMA_WAITLIST.
Diffstat (limited to 'linux-core/drmP.h')
-rw-r--r--linux-core/drmP.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index c530ca0c..9fd4149a 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -768,12 +768,11 @@ extern int DRM(getmagic)(struct inode *inode, struct file *filp,
extern int DRM(authmagic)(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
+ /* Placeholder for ioctls past */
+extern int DRM(noop)(struct inode *inode, struct file *filp,
+ unsigned int cmd, unsigned long arg);
/* Locking IOCTL support (drm_lock.h) */
-extern int DRM(block)(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern int DRM(unblock)(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
extern int DRM(lock_take)(__volatile__ unsigned int *lock,
unsigned int context);
extern int DRM(lock_transfer)(drm_device_t *dev,