Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[pandora-kernel.git] / drivers / char / drm / drm_memory.h

diff --git a/drivers/char/drm/drm_memory.h b/drivers/char/drm/drm_memory.h
index 714d9ae..63e425b 100644 (file)
--- a/drivers/char/drm/drm_memory.h
+++ b/drivers/char/drm/drm_memory.h
@@ -33,7 +33,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <linux/config.h>
 #include <linux/highmem.h>
 #include <linux/vmalloc.h>
 #include "drmP.h"
@@ -57,26 +56,6 @@
 # endif
 #endif
 
-static inline unsigned long drm_follow_page(void *vaddr)
-{
-       pgd_t *pgd = pgd_offset_k((unsigned long)vaddr);
-       pud_t *pud = pud_offset(pgd, (unsigned long)vaddr);
-       pmd_t *pmd = pmd_offset(pud, (unsigned long)vaddr);
-       pte_t *ptep = pte_offset_kernel(pmd, (unsigned long)vaddr);
-       return pte_pfn(*ptep) << PAGE_SHIFT;
-}
-
 #else                          /* __OS_HAS_AGP */
 
-static inline unsigned long drm_follow_page(void *vaddr)
-{
-       return 0;
-}
-
 #endif
-
-void *drm_ioremap(unsigned long offset, unsigned long size,
-                               drm_device_t * dev);
-
-void drm_ioremapfree(void *pt, unsigned long size,
-                                  drm_device_t * dev);