diff options
-rw-r--r-- | drivers/char/drm/drm_bufs.c | 4 | ||||
-rw-r--r-- | drivers/char/drm/drm_sman.c | 2 | ||||
-rw-r--r-- | drivers/char/drm/sis_mm.c | 11 |
3 files changed, 10 insertions, 7 deletions
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c index 71d2e0917636..03c6db9029cf 100644 --- a/drivers/char/drm/drm_bufs.c +++ b/drivers/char/drm/drm_bufs.c | |||
@@ -65,8 +65,8 @@ static drm_map_list_t *drm_find_matching_map(drm_device_t *dev, | |||
65 | return NULL; | 65 | return NULL; |
66 | } | 66 | } |
67 | 67 | ||
68 | int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash, | 68 | static int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash, |
69 | unsigned long user_token, int hashed_handle) | 69 | unsigned long user_token, int hashed_handle) |
70 | { | 70 | { |
71 | int use_hashed_handle; | 71 | int use_hashed_handle; |
72 | #if (BITS_PER_LONG == 64) | 72 | #if (BITS_PER_LONG == 64) |
diff --git a/drivers/char/drm/drm_sman.c b/drivers/char/drm/drm_sman.c index b92f0ee74b39..425c82336ee0 100644 --- a/drivers/char/drm/drm_sman.c +++ b/drivers/char/drm/drm_sman.c | |||
@@ -114,7 +114,7 @@ static void drm_sman_mm_destroy(void *private) | |||
114 | drm_free(mm, sizeof(*mm), DRM_MEM_MM); | 114 | drm_free(mm, sizeof(*mm), DRM_MEM_MM); |
115 | } | 115 | } |
116 | 116 | ||
117 | unsigned long drm_sman_mm_offset(void *private, void *ref) | 117 | static unsigned long drm_sman_mm_offset(void *private, void *ref) |
118 | { | 118 | { |
119 | drm_mm_node_t *node = (drm_mm_node_t *) ref; | 119 | drm_mm_node_t *node = (drm_mm_node_t *) ref; |
120 | return node->start; | 120 | return node->start; |
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 | ||
75 | unsigned long sis_sman_mm_offset(void *private, void *ref) | 73 | static 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 | ||
82 | static int sis_fb_init(DRM_IOCTL_ARGS) | 85 | static int sis_fb_init(DRM_IOCTL_ARGS) |
83 | { | 86 | { |