From 0d877f0ef1d3eff321b584e90e5f0ba40125b4e3 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Tue, 29 Apr 2008 10:25:48 -0500
Subject: [PATCH] --- yaml --- r: 95607 b: refs/heads/master c:
 4f452e8aa492c0b8028ca9b4bdb4d018ba28c6c7 h: refs/heads/master i:   95605:
 51ab973b39eceaa763566c1af9f3ed240fa04d35   95603:
 837809e45d43bd74a17901314a4a0d4f9f2dfc89   95599:
 636641a18eada6d54f5eee349d83e7c1cac5e347 v: v3

---
 [refs]                   | 2 +-
 trunk/include/linux/io.h | 4 ++--
 trunk/lib/devres.c       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3384b8ae852d..bdd3f79a9780 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4ca6617421188f50774780cdc91c3782b7d08fe
+refs/heads/master: 4f452e8aa492c0b8028ca9b4bdb4d018ba28c6c7
diff --git a/trunk/include/linux/io.h b/trunk/include/linux/io.h
index e3b2dda6c8eb..3a03a3604cce 100644
--- a/trunk/include/linux/io.h
+++ b/trunk/include/linux/io.h
@@ -58,9 +58,9 @@ static inline void devm_ioport_unmap(struct device *dev, void __iomem *addr)
 }
 #endif
 
-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 * 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 devm_iounmap(struct device *dev, void __iomem *addr);
 int check_signature(const volatile void __iomem *io_addr,
diff --git a/trunk/lib/devres.c b/trunk/lib/devres.c
index edc27a5d1b73..26c87c49d776 100644
--- a/trunk/lib/devres.c
+++ b/trunk/lib/devres.c
@@ -20,7 +20,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 +49,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;