diff options
| author | Rik Faith <faith@alephnull.com> | 2000-08-18 13:55:23 +0000 |
|---|---|---|
| committer | Rik Faith <faith@alephnull.com> | 2000-08-18 13:55:23 +0000 |
| commit | f0f6509a72abf3a3a0a8f26a35b7a8f3d96cbb9b (patch) | |
| tree | 2c39842303facee602aba15caba506aaf1383985 /linux-core | |
| parent | f75ec3010ad8d15d316f6e6d580c85f9e6b8466e (diff) | |
Sync with Linux 2.4.0-test7/pre4
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drmP.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 4f85d07c..0fa20571 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -46,6 +46,7 @@ #include <linux/version.h> #include <linux/sched.h> #include <linux/smp_lock.h> /* For (un)lock_kernel */ +#include <linux/mm.h> #include <asm/io.h> #include <asm/mman.h> #include <asm/uaccess.h> @@ -140,7 +141,7 @@ typedef struct wait_queue *wait_queue_head_t; #endif /* virt_to_page added in 2.4.0-test6 */ -#ifndef virt_to_page +#if LINUX_VERSION_CODE < 0x020400 #define virt_to_page(kaddr) (mem_map + MAP_NR(kaddr)) #endif |