summaryrefslogtreecommitdiffstats
path: root/include/linux/mtd/partitions.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-11 04:45:50 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-11 04:45:50 +0100
commite8b722f487589a1f60ca27adc695494f188d404e (patch)
treebe3897dceb9b7c0949a8917ab11eea2752375e3b /include/linux/mtd/partitions.h
parent01d07820a0df6b6134c1bb75b1e84c9d0cdab3be (diff)
parentc59765042f53a79a7a65585042ff463b69cb248c (diff)
downloadblackbird-op-linux-e8b722f487589a1f60ca27adc695494f188d404e.tar.gz
blackbird-op-linux-e8b722f487589a1f60ca27adc695494f188d404e.zip
Merge commit 'v2.6.29-rc1' into irq/urgent
Diffstat (limited to 'include/linux/mtd/partitions.h')
-rw-r--r--include/linux/mtd/partitions.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h
index c92b4d439609..a45dd831b3f8 100644
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
@@ -36,9 +36,9 @@
struct mtd_partition {
char *name; /* identifier string */
- u_int32_t size; /* partition size */
- u_int32_t offset; /* offset within the master MTD space */
- u_int32_t mask_flags; /* master MTD flags to mask out for this partition */
+ uint64_t size; /* partition size */
+ uint64_t offset; /* offset within the master MTD space */
+ uint32_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 */
};
OpenPOWER on IntegriCloud