diff --git a/[refs] b/[refs]
index babe24fb8481..57f4d02ef99d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41d4f0e61283f6807553c129416fc20766a7043f
+refs/heads/master: f13b68e8174657b0253ca7cf263521ed3ac19125
diff --git a/trunk/arch/mips/mm/highmem.c b/trunk/arch/mips/mm/highmem.c
index 1f7b37b38f5c..0c544375b856 100644
--- a/trunk/arch/mips/mm/highmem.c
+++ b/trunk/arch/mips/mm/highmem.c
@@ -83,6 +83,7 @@ void __kunmap_atomic(void *kvaddr, enum km_type type)
 	preempt_check_resched();
 }
 
+#ifndef CONFIG_LIMITED_DMA
 /*
  * This is the same as kmap_atomic() but can map memory that doesn't
  * have a struct page associated with it.
@@ -101,6 +102,7 @@ void *kmap_atomic_pfn(unsigned long pfn, enum km_type type)
 
 	return (void*) vaddr;
 }
+#endif /* CONFIG_LIMITED_DMA */
 
 struct page *__kmap_atomic_to_page(void *ptr)
 {