summaryrefslogtreecommitdiff
path: root/drivers/char/drm/sis_mm.c
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-08-16 05:55:18 +0400
committerDave Airlie <airlied@linux.ie>2006-09-21 23:32:33 +0400
commitfb41e54be4bad6f64d343d051d699efde3c92e2c (patch)
treed52f398bfbafe071e09a46c8637bd79c9a608753 /drivers/char/drm/sis_mm.c
parentc7aed1790254aed286b7bfb51167c2676df86f4b (diff)
downloadlinux-fb41e54be4bad6f64d343d051d699efde3c92e2c.tar.xz
drm: cleanups
This patch contains the following cleanups: - make 3 needlessly global functions static - sis_mm.c: fix compile warnings with CONFIG_FB_SIS=y Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/sis_mm.c')
-rw-r--r--drivers/char/drm/sis_mm.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c
index 1b21e324d04e..d26f5dbb7853 100644
--- a/drivers/char/drm/sis_mm.c
+++ b/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)
{