X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=lib%2Fdevres.c;h=49368608f988872da20525722d1406ef3a94a520;hb=c713541125002b8bc9e681af3b09118e771e2d8a;hp=edc27a5d1b735aba4855d33e9756ab375d9569ce;hpb=916fbfb7ae5f8c8f86399794d89e6d273df8826b;p=safe%2Fjmp%2Flinux-2.6

diff --git a/lib/devres.c b/lib/devres.c
index edc27a5..4936860 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -1,8 +1,9 @@
 #include <linux/pci.h>
 #include <linux/io.h>
+#include <linux/gfp.h>
 #include <linux/module.h>
 
-static void devm_ioremap_release(struct device *dev, void *res)
+void devm_ioremap_release(struct device *dev, void *res)
 {
 	iounmap(*(void __iomem **)res);
 }
@@ -20,7 +21,7 @@ static int devm_ioremap_match(struct device *dev, void *res, void *match_data)
  *
  * Managed ioremap().  Map is automatically unmapped on driver detach.
  */
-void __iomem *devm_ioremap(struct device *dev, unsigned long offset,
+void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
 			   unsigned long size)
 {
 	void __iomem **ptr, *addr;
@@ -49,7 +50,7 @@ EXPORT_SYMBOL(devm_ioremap);
  * Managed ioremap_nocache().  Map is automatically unmapped on driver
  * detach.
  */
-void __iomem *devm_ioremap_nocache(struct device *dev, unsigned long offset,
+void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
 				   unsigned long size)
 {
 	void __iomem **ptr, *addr;