added some suse-specific patches to the kernel.

[linux-flexiantxendom0-3.2.10.git] / drivers / char / drm / drmP.h

diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 9d6433b..c0f95fe 100644 (file)
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -225,16 +225,16 @@ static inline struct page * vmalloc_to_page(void * vmalloc_addr)
    if (len > DRM_PROC_LIMIT) { ret; *eof = 1; return len - offset; }
 
                                /* Mapping helper macros */
-#define DRM_IOREMAP(map, dev)                                                  \
-       (map)->handle = DRM(ioremap)( (map)->offset, (map)->size, (dev) )
+#define DRM_IOREMAP(map)                                               \
+       (map)->handle = DRM(ioremap)( (map)->offset, (map)->size )
 
-#define DRM_IOREMAP_NOCACHE(map, dev)                                          \
-       (map)->handle = DRM(ioremap_nocache)((map)->offset, (map)->size, (dev))
+#define DRM_IOREMAP_NOCACHE(map)                                       \
+       (map)->handle = DRM(ioremap_nocache)((map)->offset, (map)->size)
 
-#define DRM_IOREMAPFREE(map, dev)                                                      \
-       do {                                                                    \
-               if ( (map)->handle && (map)->size )                             \
-                       DRM(ioremapfree)( (map)->handle, (map)->size, (dev) );  \
+#define DRM_IOREMAPFREE(map)                                           \
+       do {                                                            \
+               if ( (map)->handle && (map)->size )                     \
+                       DRM(ioremapfree)( (map)->handle, (map)->size ); \
        } while (0)
 
 #define DRM_FIND_MAP(_map, _o)                                                         \
@@ -652,10 +652,9 @@ extern void             DRM(free)(void *pt, size_t size, int area);
 extern unsigned long DRM(alloc_pages)(int order, int area);
 extern void         DRM(free_pages)(unsigned long address, int order,
                                     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 void         *DRM(ioremap)(unsigned long offset, unsigned long size);
+extern void         *DRM(ioremap_nocache)(unsigned long offset, unsigned long size);
+extern void         DRM(ioremapfree)(void *pt, unsigned long size);
 
 #if __REALLY_HAVE_AGP
 extern agp_memory    *DRM(alloc_agp)(int pages, u32 type);