Merge tag 'platform-drivers-x86-v3.20-1' of git://git.infradead.org/users/dvhart...

[firefly-linux-kernel-4.4.55.git] / drivers / pcmcia / rsrc_mgr.c

diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index aa628ed0e9f48178ca3ac9b1fbba39a370877228..df2cb70aef5b6791ad5b9989af76805f64346722 100644 (file)
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -30,8 +30,9 @@ int static_init(struct pcmcia_socket *s)
        return 0;
 }
 
-struct resource *pcmcia_make_resource(unsigned long start, unsigned long end,
-                               int flags, const char *name)
+struct resource *pcmcia_make_resource(resource_size_t start,
+                                       resource_size_t end,
+                                       unsigned long flags, const char *name)
 {
        struct resource *res = kzalloc(sizeof(*res), GFP_KERNEL);