aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/sis_mm.c
diff options
context:
space:
mode:
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 @@
40#define VIDEO_TYPE 0 40#define VIDEO_TYPE 0
41#define AGP_TYPE 1 41#define AGP_TYPE 1
42 42
43#define SIS_MM_ALIGN_SHIFT 4
44#define SIS_MM_ALIGN_MASK ( (1 << SIS_MM_ALIGN_SHIFT) - 1)
45 43
46#if defined(CONFIG_FB_SIS) 44#if defined(CONFIG_FB_SIS)
47/* fb management via fb device */ 45/* fb management via fb device */
@@ -72,12 +70,17 @@ static void sis_sman_mm_destroy(void *private)
72 ; 70 ;
73} 71}
74 72
75unsigned long sis_sman_mm_offset(void *private, void *ref) 73static unsigned long sis_sman_mm_offset(void *private, void *ref)
76{ 74{
77 return ~((unsigned long)ref); 75 return ~((unsigned long)ref);
78} 76}
79 77
80#endif 78#else /* CONFIG_FB_SIS */
79
80#define SIS_MM_ALIGN_SHIFT 4
81#define SIS_MM_ALIGN_MASK ( (1 << SIS_MM_ALIGN_SHIFT) - 1)
82
83#endif /* CONFIG_FB_SIS */
81 84
82static int sis_fb_init(DRM_IOCTL_ARGS) 85static int sis_fb_init(DRM_IOCTL_ARGS)
83{ 86{