Merge branch 'next' of ../next

[u-boot] / include / linux / mtd / partitions.h

diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h
index b41e5f564cbad03b58ac0e03e6fbc54d32f45272..d1d9a96d583f89fccfb7f1cfc5c2c55369467385 100644 (file)
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
@@ -38,8 +38,8 @@
 
 struct mtd_partition {
        char *name;                     /* identifier string */
-       u_int32_t size;                 /* partition size */
-       u_int32_t offset;               /* offset within the master MTD space */
+       uint64_t size;                  /* partition size */
+       uint64_t offset;                /* offset within the master MTD space */
        u_int32_t mask_flags;           /* master MTD flags to mask out for this partition */
        struct nand_ecclayout *ecclayout;       /* out of band layout for this partition (NAND only)*/
        struct mtd_info **mtdp;         /* pointer to store the MTD object */
@@ -76,9 +76,9 @@ struct device;
 struct device_node;
 
 int __devinit of_mtd_parse_partitions(struct device *dev,
-                                      struct mtd_info *mtd,
-                                      struct device_node *node,
-                                      struct mtd_partition **pparts);
+                                     struct mtd_info *mtd,
+                                     struct device_node *node,
+                                     struct mtd_partition **pparts);
 #endif
 
 #endif