X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Flinux%2Fio.h;h=8423dd376514aee8d93cbeb2155647a78d54ee33;hb=c34b19fb4e243b26fa90a322bf32238356493674;hp=81877ea39309aea73cef4a63a3212c69ab5c9131;hpb=60ca97584fcb98d2f1b14e4c2f12203dd5b3888e;p=powerpc.git

diff --git a/include/linux/io.h b/include/linux/io.h
index 81877ea393..8423dd3765 100644
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -22,11 +22,47 @@
 #include <asm/io.h>
 #include <asm/page.h>
 
+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
+ */
+#ifdef CONFIG_HAS_IOPORT
+void __iomem * devm_ioport_map(struct device *dev, unsigned long port,
+			       unsigned int nr);
+void devm_ioport_unmap(struct device *dev, void __iomem *addr);
+#else
+static inline void __iomem *devm_ioport_map(struct device *dev,
+					     unsigned long port,
+					     unsigned int nr)
+{
+	return NULL;
+}
+
+static inline void devm_ioport_unmap(struct device *dev, void __iomem *addr)
+{
+}
+#endif
+
+void __iomem * devm_ioremap(struct device *dev, unsigned long offset,
+			    unsigned long size);
+void __iomem * devm_ioremap_nocache(struct device *dev, unsigned long offset,
+				    unsigned long size);
+void devm_iounmap(struct device *dev, void __iomem *addr);
 
 /**
  *	check_signature		-	find BIOS signatures