From 187d32a2d2dea5f0b341f962f97c7f6bc20f0598 Mon Sep 17 00:00:00 2001
From: Richard Weinberger <richard@nod.at>
Date: Tue, 7 Feb 2012 01:22:47 +0100
Subject: [PATCH] --- yaml --- r: 296438 b: refs/heads/master c:
 4d94d6d030adfdea4837694d293ec6918d133ab2 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/um/include/asm/pgtable.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a25cbd13e597..cc25ba60b82e 100644
--- 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
index 41474fb5eee7..6a3f9845743e 100644
--- 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.