diff --git a/Device3Dfx/3dfx_driver.c b/Device3Dfx/3dfx_driver.c
index 6092881..4b93de7 100644
--- a/Device3Dfx/3dfx_driver.c
+++ b/Device3Dfx/3dfx_driver.c
@@ -191,7 +191,10 @@ static struct pci_card {
 #define VM_OFFSET_ALIGNED(vma) ((vma->vm_pgoff) & ~PAGE_MASK)
 #endif
 
-#if KERNEL_MIN_VER(2,6,0)
+#if KERNEL_MIN_VER(2,6,10)
+#define my_remap_page_range(vma, start, ofs, len, prot) \
+	remap_pfn_range(vma, start, ofs >> PAGE_SHIFT, len, prot)
+#elif KERNEL_MIN_VER(2,6,0)
 #define my_remap_page_range(vma, start, ofs, len, prot) \
 	remap_page_range(vma, start, ofs, len, prot)
 #else
diff --git a/Device3Dfx/ChangeLog b/Device3Dfx/ChangeLog
index 104d6f5..fbf264b 100644
--- a/Device3Dfx/ChangeLog
+++ b/Device3Dfx/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-03  Guillem Jover  <guillem@hadrons.org>
+
+	* 3dfx_device.c (my_remap_page_range): Define as remap_pfn_range for
+	linux 2.6.10 or higher.
+
 2006-12-03  Guillem Jover  <guillem@hadrons.org>
 
 	Use the "new" kernel level exception handling for memory accesses