Merge branch 'keys-sig' into keys-next

[deliverable/linux.git] / include / linux / uio_driver.h

diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
index baa81718d985afd9e90d70e90f18e66f96da5f8d..32c0e83d62397355e1b6bb804c1d0381f56daca1 100644 (file)
--- a/include/linux/uio_driver.h
+++ b/include/linux/uio_driver.h
@@ -35,7 +35,7 @@ struct uio_map;
 struct uio_mem {
        const char              *name;
        phys_addr_t             addr;
-       unsigned long           size;
+       resource_size_t         size;
        int                     memtype;
        void __iomem            *internal_addr;
        struct uio_map          *map;