From 8dc39e3f3450e6e0759ad8c401a81f8b52d0bfca Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@starflyer.(none)>
Date: Mon, 5 Sep 2005 21:33:44 +1000
Subject: [PATCH] --- yaml --- r: 7629 b: refs/heads/master c:
 f210973bb6d17aa220c797e8ea23d127d96859b7 h: refs/heads/master i:   7627:
 1fd8d01c8a2342f7edd6619b868b7d93db955ade v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/char/drm/drm_bufs.c    | 2 +-
 trunk/drivers/char/drm/drm_context.c | 2 +-
 trunk/drivers/char/drm/drm_sysfs.c   | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1b1f0a6544e9..2d7fd4990901 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89625eb186b9b0b9454d44126f8b1bcc72ad93b7
+refs/heads/master: f210973bb6d17aa220c797e8ea23d127d96859b7
diff --git a/trunk/drivers/char/drm/drm_bufs.c b/trunk/drivers/char/drm/drm_bufs.c
index 8eff0736a94d..f28e70ae6606 100644
--- a/trunk/drivers/char/drm/drm_bufs.c
+++ b/trunk/drivers/char/drm/drm_bufs.c
@@ -1041,7 +1041,7 @@ static int drm_addbufs_sg(drm_device_t *dev, drm_buf_desc_t *request)
 	return 0;
 }
 
-int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request)
+static int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request)
 {
 	drm_device_dma_t *dma = dev->dma;
 	drm_buf_entry_t *entry;
diff --git a/trunk/drivers/char/drm/drm_context.c b/trunk/drivers/char/drm/drm_context.c
index f515567e5b6f..502892794c16 100644
--- a/trunk/drivers/char/drm/drm_context.c
+++ b/trunk/drivers/char/drm/drm_context.c
@@ -308,7 +308,7 @@ int drm_setsareactx(struct inode *inode, struct file *filp,
  *
  * Attempt to set drm_device::context_flag.
  */
-int drm_context_switch( drm_device_t *dev, int old, int new )
+static int drm_context_switch( drm_device_t *dev, int old, int new )
 {
         if ( test_and_set_bit( 0, &dev->context_flag ) ) {
                 DRM_ERROR( "Reentering -- FIXME\n" );
diff --git a/trunk/drivers/char/drm/drm_sysfs.c b/trunk/drivers/char/drm/drm_sysfs.c
index 2fc10c4bbcdf..475cc5e555e1 100644
--- a/trunk/drivers/char/drm/drm_sysfs.c
+++ b/trunk/drivers/char/drm/drm_sysfs.c
@@ -17,6 +17,7 @@
 #include <linux/err.h>
 
 #include "drm_core.h"
+#include "drmP.h"
 
 struct drm_sysfs_class {
 	struct class_device_attribute attr;