X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fio.h;h=c244a0cc9319bc37dfaee08d2c385b638dcbc990;hb=e7b58f5259a81dbd9fbfea79408d272f44eb894f;hp=81877ea39309aea73cef4a63a3212c69ab5c9131;hpb=7c2aed4b5632fb536721b8494d1a4a65852ffb49;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/io.h b/include/linux/io.h
index 81877ea3930..c244a0cc931 100644
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -22,12 +22,27 @@
 #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);
 
 int ioremap_page_range(unsigned long addr, unsigned long end,
 		       unsigned long phys_addr, pgprot_t prot);
 
+/*
+ * Managed iomap interface
+ */
+void __iomem * devm_ioport_map(struct device *dev, unsigned long port,
+			       unsigned int nr);
+void devm_ioport_unmap(struct device *dev, void __iomem *addr);
+
+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
  *	@io_addr: mmio address to check