patch-2.4.0-test8 linux/drivers/char/drm/drmP.h

Next file: linux/drivers/char/drm/ffb_context.c
Previous file: linux/drivers/char/drm/drawable.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test7/linux/drivers/char/drm/drmP.h linux/drivers/char/drm/drmP.h
@@ -57,10 +57,13 @@
 #include <linux/types.h>
 #include <linux/agp_backend.h>
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0)
+#if LINUX_VERSION_CODE >= 0x020100 /* KERNEL_VERSION(2,1,0) */
 #include <linux/tqueue.h>
 #include <linux/poll.h>
 #endif
+#if LINUX_VERSION_CODE < 0x020400
+#include "compat-pre24.h"
+#endif
 #include "drm.h"
 
 #define DRM_DEBUG_CODE 2	  /* Include debugging code (if > 1, then
@@ -138,11 +141,6 @@
 #endif
 #ifndef module_exit
 #define module_exit(x)  void cleanup_module(void) { x(); }
-#endif
-
-				/* virt_to_page added in 2.4.0-test6 */
-#if LINUX_VERSION_CODE < 0x020400
-#define virt_to_page(kaddr) (mem_map + MAP_NR(kaddr))
 #endif
 
 				/* Generic cmpxchg added in 2.3.x */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)