---

yaml --- r: 296438 b: refs/heads/master c: 4d94d6d h: refs/heads/master v: v3
git-mirror · Mar 24, 2012 · 187d32a · 187d32a
1 parent a61f798
commit 187d32a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 087fafd15204fb7a5df44b635ed3d3f4348f2d5e
+refs/heads/master: 4d94d6d030adfdea4837694d293ec6918d133ab2
diff --git a/trunk/arch/um/include/asm/pgtable.h b/trunk/arch/um/include/asm/pgtable.h
@@ -69,6 +69,8 @@ extern unsigned long end_iomem;
 #define PAGE_KERNEL	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED)
 #define PAGE_KERNEL_EXEC	__pgprot(__PAGE_KERNEL_EXEC)
 
+#define io_remap_pfn_range	remap_pfn_range
+
 /*
  * The i386 can't do page protection for execute, and considers that the same
  * are read.