From 2869f5ee3d066d43951816e6c32dd73fa166ee2f Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Wed, 16 Aug 2006 11:55:18 +1000
Subject: [PATCH] --- yaml --- r: 37512 b: refs/heads/master c:
 fb41e54be4bad6f64d343d051d699efde3c92e2c h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/char/drm/drm_bufs.c |  4 ++--
 trunk/drivers/char/drm/drm_sman.c |  2 +-
 trunk/drivers/char/drm/sis_mm.c   | 11 +++++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 734a7da511df..cda15f008704 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7aed1790254aed286b7bfb51167c2676df86f4b
+refs/heads/master: fb41e54be4bad6f64d343d051d699efde3c92e2c
diff --git a/trunk/drivers/char/drm/drm_bufs.c b/trunk/drivers/char/drm/drm_bufs.c
index 71d2e0917636..03c6db9029cf 100644
--- a/trunk/drivers/char/drm/drm_bufs.c
+++ b/trunk/drivers/char/drm/drm_bufs.c
@@ -65,8 +65,8 @@ static drm_map_list_t *drm_find_matching_map(drm_device_t *dev,
 	return NULL;
 }
 
-int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash,
-		   unsigned long user_token, int hashed_handle)
+static int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash,
+			  unsigned long user_token, int hashed_handle)
 {
 	int use_hashed_handle;
 #if (BITS_PER_LONG == 64)
diff --git a/trunk/drivers/char/drm/drm_sman.c b/trunk/drivers/char/drm/drm_sman.c
index b92f0ee74b39..425c82336ee0 100644
--- a/trunk/drivers/char/drm/drm_sman.c
+++ b/trunk/drivers/char/drm/drm_sman.c
@@ -114,7 +114,7 @@ static void drm_sman_mm_destroy(void *private)
 	drm_free(mm, sizeof(*mm), DRM_MEM_MM);
 }
 
-unsigned long drm_sman_mm_offset(void *private, void *ref)
+static unsigned long drm_sman_mm_offset(void *private, void *ref)
 {
 	drm_mm_node_t *node = (drm_mm_node_t *) ref;
 	return node->start;
diff --git a/trunk/drivers/char/drm/sis_mm.c b/trunk/drivers/char/drm/sis_mm.c
index 1b21e324d04e..d26f5dbb7853 100644
--- a/trunk/drivers/char/drm/sis_mm.c
+++ b/trunk/drivers/char/drm/sis_mm.c
@@ -40,8 +40,6 @@
 #define VIDEO_TYPE 0
 #define AGP_TYPE 1
 
-#define SIS_MM_ALIGN_SHIFT 4
-#define SIS_MM_ALIGN_MASK ( (1 << SIS_MM_ALIGN_SHIFT) - 1)
 
 #if defined(CONFIG_FB_SIS)
 /* fb management via fb device */
@@ -72,12 +70,17 @@ static void sis_sman_mm_destroy(void *private)
 	;
 }
 
-unsigned long sis_sman_mm_offset(void *private, void *ref)
+static unsigned long sis_sman_mm_offset(void *private, void *ref)
 {
 	return ~((unsigned long)ref);
 }
 
-#endif
+#else /* CONFIG_FB_SIS */
+
+#define SIS_MM_ALIGN_SHIFT 4
+#define SIS_MM_ALIGN_MASK ( (1 << SIS_MM_ALIGN_SHIFT) - 1)
+
+#endif /* CONFIG_FB_SIS */
 
 static int sis_fb_init(DRM_IOCTL_ARGS)
 {