diff --git a/[refs] b/[refs]
index 1dd51820a0c1..1f4cab36a0a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c783a29efcbc90a90ccfec8956c7ff0854301c34
+refs/heads/master: ea56f411ec2d4d8689eb7f3bcd24e860acf87c47
diff --git a/trunk/drivers/char/mem.c b/trunk/drivers/char/mem.c
index 9cdbadc68608..f54dab8acdcd 100644
--- a/trunk/drivers/char/mem.c
+++ b/trunk/drivers/char/mem.c
@@ -225,6 +225,7 @@ int __weak phys_mem_access_prot_allowed(struct file *file,
  * outside of main memory.
  *
  */
+#ifdef pgprot_noncached
 static int uncached_access(struct file *file, unsigned long addr)
 {
 #if defined(CONFIG_IA64)
@@ -251,6 +252,7 @@ static int uncached_access(struct file *file, unsigned long addr)
 	return addr >= __pa(high_memory);
 #endif
 }
+#endif
 
 static pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
 				     unsigned long size, pgprot_t vma_prot)