Merge branch 'linus' into x86/amd-iommu

[linux-2.6] / drivers / mtd / ubi / scan.h

diff --git a/drivers/mtd/ubi/scan.h b/drivers/mtd/ubi/scan.h
index 46d444af471a24a094fc3c0aa54d76e91dda94bd..966b9b682a423819921f69ca02e626ad0c89772b 100644 (file)
--- a/drivers/mtd/ubi/scan.h
+++ b/drivers/mtd/ubi/scan.h
@@ -124,7 +124,7 @@ struct ubi_scan_info {
        int max_ec;
        unsigned long long max_sqnum;
        int mean_ec;
-       int ec_sum;
+       uint64_t ec_sum;
        int ec_count;
 };