3.9.18 merge

diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index fd0c75a..2542300 100644 (file)
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -1,6 +1,6 @@
 /* xf86drm.c -- User-level interface to DRM device
  * Created: Tue Jan  5 08:16:21 1999 by faith@precisioninsight.com
- * Revised: Thu Jan  6 10:32:25 2000 by faith@precisioninsight.com
+ * Revised: Sun Feb 13 23:43:32 2000 by kevin@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * All Rights Reserved.
@@ -24,7 +24,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.6 1999/12/14 01:33:54 robin Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.9 2000/02/14 06:27:24 martin Exp $
  * 
  */
 

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 0d5f7b8..25c3542 100644 (file)
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -1,6 +1,6 @@
 /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
  * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
- * Revised: Mon Dec  6 16:06:49 1999 by faith@precisioninsight.com
+ * Revised: Sun Feb 13 23:34:30 2000 by kevin@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * All rights reserved.
@@ -25,7 +25,7 @@
  * DEALINGS IN THE SOFTWARE.
  * 
  * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.58 1999/08/30 13:05:00 faith Exp $
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.1 1999/09/25 14:37:59 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.5 2000/02/14 06:27:26 martin Exp $
  * 
  */
 

diff --git a/linux-core/tdfx_drv.c b/linux-core/tdfx_drv.c
index 769d7ad..61c917e 100644 (file)
--- a/linux-core/tdfx_drv.c
+++ b/linux-core/tdfx_drv.c
@@ -25,7 +25,7 @@
  * DEALINGS IN THE SOFTWARE.
  * 
  * $PI$
- * $XFree86$
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c,v 1.2 2000/01/20 07:25:36 martin Exp $
  *
  */
 
@@ -53,7 +53,7 @@ static struct file_operations tdfx_fops = {
        mmap:    drm_mmap,
        read:    drm_read,
        fasync:  drm_fasync,
-       poll: drm_poll
+       poll:    drm_poll,
 };
 
 static struct miscdevice      tdfx_misc = {

diff --git a/linux/Makefile.linux b/linux/Makefile.linux
index 6309277..0f14540 100644 (file)
--- a/linux/Makefile.linux
+++ b/linux/Makefile.linux
@@ -1,6 +1,6 @@
 # Makefile -- For the Direct Rendering Manager module (drm)
 # Created: Mon Jan  4 09:26:53 1999 by faith@precisioninsight.com
-# Revised: Mon Jan 17 05:25:12 2000 by faith@precisioninsight.com
+# Revised: Sun Feb 13 23:15:59 2000 by kevin@precisioninsight.com
 #
 # Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
 # All rights reserved.
@@ -25,7 +25,7 @@
 # DEALINGS IN THE SOFTWARE.
 # 
 # $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/generic/Makefile.linux,v 1.23 1999/07/02 17:46:30 faith Exp $
-# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/generic/Makefile.linux,v 1.3 1999/06/27 14:08:21 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux,v 1.5 2000/02/14 06:27:25 martin Exp $
 # 
 
 .SUFFIXES:

diff --git a/linux/drmP.h b/linux/drmP.h
index 0d5f7b8..25c3542 100644 (file)
--- a/linux/drmP.h
+++ b/linux/drmP.h
@@ -1,6 +1,6 @@
 /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
  * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
- * Revised: Mon Dec  6 16:06:49 1999 by faith@precisioninsight.com
+ * Revised: Sun Feb 13 23:34:30 2000 by kevin@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * All rights reserved.
@@ -25,7 +25,7 @@
  * DEALINGS IN THE SOFTWARE.
  * 
  * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.58 1999/08/30 13:05:00 faith Exp $
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.1 1999/09/25 14:37:59 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.5 2000/02/14 06:27:26 martin Exp $
  * 
  */
 

diff --git a/linux/fops.c b/linux/fops.c
index 0bdf213..ceef1d8 100644 (file)
--- 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 <linux/poll.h>
 
 /* 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;

diff --git a/linux/lists.c b/linux/lists.c
index 120817c..78d2171 100644 (file)
--- a/linux/lists.c
+++ b/linux/lists.c
@@ -1,6 +1,6 @@
 /* lists.c -- Buffer list handling routines -*- linux-c -*-
  * Created: Mon Apr 19 20:54:22 1999 by faith@precisioninsight.com
- * Revised: Mon Dec  6 16:04:44 1999 by faith@precisioninsight.com
+ * Revised: Sun Feb 13 23:37:52 2000 by kevin@precisioninsight.com
  *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * All Rights Reserved.
@@ -25,7 +25,7 @@
  * DEALINGS IN THE SOFTWARE.
  * 
  * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c,v 1.3 1999/08/20 15:07:02 faith Exp $
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c,v 1.1 1999/09/25 14:38:01 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c,v 1.4 2000/02/14 06:27:27 martin Exp $
  *
  */
 

diff --git a/linux/tdfx_drv.c b/linux/tdfx_drv.c
index 769d7ad..61c917e 100644 (file)
--- a/linux/tdfx_drv.c
+++ b/linux/tdfx_drv.c
@@ -25,7 +25,7 @@
  * DEALINGS IN THE SOFTWARE.
  * 
  * $PI$
- * $XFree86$
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c,v 1.2 2000/01/20 07:25:36 martin Exp $
  *
  */
 
@@ -53,7 +53,7 @@ static struct file_operations tdfx_fops = {
        mmap:    drm_mmap,
        read:    drm_read,
        fasync:  drm_fasync,
-       poll: drm_poll
+       poll:    drm_poll,
 };
 
 static struct miscdevice      tdfx_misc = {