Merge tag 'iwlwifi-fixes-for-kalle-2014-12-18' of git://git.kernel.org/pub/scm/linux...

[deliverable/linux.git] / lib / devres.c

diff --git a/lib/devres.c b/lib/devres.c
index f4a195a6efe4fccb7eb1c6d5fedda5d250eac355..0f1dd2e9d2c1e572386acb280695e76a2f58406e 100644 (file)
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -23,7 +23,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, resource_size_t offset,
-                          unsigned long size)
+                          resource_size_t size)
 {
        void __iomem **ptr, *addr;
 
@@ -52,7 +52,7 @@ EXPORT_SYMBOL(devm_ioremap);
  * detach.
  */
 void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
-                                  unsigned long size)
+                                  resource_size_t size)
 {
        void __iomem **ptr, *addr;