Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / include / linux / io.h

diff --git a/include/linux/io.h b/include/linux/io.h
index 09d351236379fa1b0711752b1b51a870103ee6d8..8423dd376514aee8d93cbeb2155647a78d54ee33 100644 (file)
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -27,8 +27,16 @@ struct device;
 void __iowrite32_copy(void __iomem *to, const void *from, size_t count);
 void __iowrite64_copy(void __iomem *to, const void *from, size_t count);
 
+#ifdef CONFIG_MMU
 int ioremap_page_range(unsigned long addr, unsigned long end,
                       unsigned long phys_addr, pgprot_t prot);
+#else
+static inline int ioremap_page_range(unsigned long addr, unsigned long end,
+                                    unsigned long phys_addr, pgprot_t prot)
+{
+       return 0;
+}
+#endif
 
 /*
  * Managed iomap interface