From d9ff0e3884abd19cdf99426d4d4b1e8f17b4ffd1 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Tue, 22 Feb 2000 22:10:28 +0000 Subject: 3.9.18 merge --- linux/fops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'linux/fops.c') diff --git a/linux/fops.c b/linux/fops.c index 0bdf2135..ceef1d8c 100644 --- a/linux/fops.c +++ b/linux/fops.c @@ -25,12 +25,13 @@ * DEALINGS IN THE SOFTWARE. * * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c,v 1.3 1999/08/20 15:36:45 faith Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c,v 1.1 1999/09/25 14:37:59 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c,v 1.5 2000/02/14 06:27:27 martin Exp $ * */ #define __NO_VERSION__ #include "drmP.h" +#include /* drm_open is called whenever a process opens /dev/drm. */ @@ -226,6 +227,7 @@ unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait) { drm_file_t *priv = filp->private_data; drm_device_t *dev = priv->dev; + poll_wait(filp, &dev->buf_readers, wait); if (dev->buf_wp != dev->buf_rp) return POLLIN | POLLRDNORM; return 0; -- cgit v1.2.3