4 files changed, 25 insertions, 30 deletions

diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index edc72a6348a7..e1aadae00623 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -815,8 +815,6 @@ extern int drm_mem_info(char *buf, char **start, off_t offset,
 extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area);
 extern void *drm_ioremap(unsigned long offset, unsigned long size,
                          drm_device_t * dev);
-extern void *drm_ioremap_nocache(unsigned long offset, unsigned long size,
-                                 drm_device_t * dev);
 extern void drm_ioremapfree(void *pt, unsigned long size, drm_device_t * dev);
 
 extern DRM_AGP_MEM *drm_alloc_agp(drm_device_t * dev, int pages, u32 type);
@@ -1022,11 +1020,13 @@ static __inline__ void drm_core_ioremap(struct drm_map *map,
         map->handle = drm_ioremap(map->offset, map->size, dev);
 }
 
+#if 0
 static __inline__ void drm_core_ioremap_nocache(struct drm_map *map,
                                                 struct drm_device *dev)
 {
         map->handle = drm_ioremap_nocache(map->offset, map->size, dev);
 }
+#endif  /*  0  */
 
 static __inline__ void drm_core_ioremapfree(struct drm_map *map,
                                             struct drm_device *dev)
diff --git a/drivers/char/drm/drm_memory.c b/drivers/char/drm/drm_memory.c
index 7ea00e3372fd..7e3318e1d1c6 100644
--- a/drivers/char/drm/drm_memory.c
+++ b/drivers/char/drm/drm_memory.c
@@ -83,8 +83,8 @@ void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area)
 /*
  * Find the drm_map that covers the range [offset, offset+size).
  */
-drm_map_t *drm_lookup_map(unsigned long offset,
-                                        unsigned long size, drm_device_t * dev)
+static drm_map_t *drm_lookup_map(unsigned long offset,
+                                 unsigned long size, drm_device_t * dev)
 {
         struct list_head *list;
         drm_map_list_t *r_list;
@@ -102,8 +102,8 @@ drm_map_t *drm_lookup_map(unsigned long offset,
         return NULL;
 }
 
-void *agp_remap(unsigned long offset, unsigned long size,
-                              drm_device_t * dev)
+static void *agp_remap(unsigned long offset, unsigned long size,
+                       drm_device_t * dev)
 {
         unsigned long *phys_addr_map, i, num_pages =
             PAGE_ALIGN(size) / PAGE_SIZE;
@@ -168,6 +168,21 @@ int drm_unbind_agp(DRM_AGP_MEM * handle)
 {
         return drm_agp_unbind_memory(handle);
 }
+
+#else  /*  __OS_HAS_AGP  */
+
+static inline drm_map_t *drm_lookup_map(unsigned long offset,
+                                        unsigned long size, drm_device_t * dev)
+{
+        return NULL;
+}
+
+static inline void *agp_remap(unsigned long offset, unsigned long size,
+                              drm_device_t * dev)
+{
+        return NULL;
+}
+
 #endif                          /* agp */
 
 void *drm_ioremap(unsigned long offset, unsigned long size,
@@ -183,6 +198,7 @@ void *drm_ioremap(unsigned long offset, unsigned long size,
 }
 EXPORT_SYMBOL(drm_ioremap);
 
+#if 0
 void *drm_ioremap_nocache(unsigned long offset,
                                         unsigned long size, drm_device_t * dev)
 {
@@ -194,6 +210,7 @@ void *drm_ioremap_nocache(unsigned long offset,
         }
         return ioremap_nocache(offset, size);
 }
+#endif  /*  0  */
 
 void drm_ioremapfree(void *pt, unsigned long size,
                                    drm_device_t * dev)
diff --git a/drivers/char/drm/drm_memory.h b/drivers/char/drm/drm_memory.h
index 645a08878e55..714d9aedcff5 100644
--- a/drivers/char/drm/drm_memory.h
+++ b/drivers/char/drm/drm_memory.h
@@ -57,15 +57,6 @@
 # endif
 #endif
 
-/*
- * Find the drm_map that covers the range [offset, offset+size).
- */
-drm_map_t *drm_lookup_map(unsigned long offset,
-                                        unsigned long size, drm_device_t * dev);
-
-void *agp_remap(unsigned long offset, unsigned long size,
-                              drm_device_t * dev);
-
 static inline unsigned long drm_follow_page(void *vaddr)
 {
         pgd_t *pgd = pgd_offset_k((unsigned long)vaddr);
@@ -77,18 +68,6 @@ static inline unsigned long drm_follow_page(void *vaddr)
 
 #else                           /* __OS_HAS_AGP */
 
-static inline drm_map_t *drm_lookup_map(unsigned long offset,
-                                        unsigned long size, drm_device_t * dev)
-{
-        return NULL;
-}
-
-static inline void *agp_remap(unsigned long offset, unsigned long size,
-                              drm_device_t * dev)
-{
-        return NULL;
-}
-
 static inline unsigned long drm_follow_page(void *vaddr)
 {
         return 0;
@@ -99,8 +78,5 @@ static inline unsigned long drm_follow_page(void *vaddr)
 void *drm_ioremap(unsigned long offset, unsigned long size,
                                 drm_device_t * dev);
 
-void *drm_ioremap_nocache(unsigned long offset,
-                                        unsigned long size, drm_device_t * dev);
-
 void drm_ioremapfree(void *pt, unsigned long size,
                                    drm_device_t * dev);
diff --git a/drivers/char/drm/drm_memory_debug.h b/drivers/char/drm/drm_memory_debug.h
index 7868341817da..6543b9a14c42 100644
--- a/drivers/char/drm/drm_memory_debug.h
+++ b/drivers/char/drm/drm_memory_debug.h
@@ -229,6 +229,7 @@ void *drm_ioremap (unsigned long offset, unsigned long size,
         return pt;
 }
 
+#if 0
 void *drm_ioremap_nocache (unsigned long offset, unsigned long size,
                             drm_device_t * dev) {
         void *pt;
@@ -251,6 +252,7 @@ void *drm_ioremap_nocache (unsigned long offset, unsigned long size,
         spin_unlock(&drm_mem_lock);
         return pt;
 }
+#endif  /*  0  */
 
 void drm_ioremapfree (void *pt, unsigned long size, drm_device_t * dev) {
         int alloc_count;