Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / mach-omap2 / utils.c

diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c
index 5478416e9c8659f1204286ef093b9f054353d34c..6e6791fc6595320c56ea745573c1e88c433d9aac 100644 (file)
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -5,7 +5,7 @@
  */
 #include <common.h>
 #include <env.h>
-#include <environment.h>
+#include <part.h>
 #include <asm/setup.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
@@ -91,7 +91,7 @@ static u32 omap_mmc_get_part_size(const char *part)
 {
        int res;
        struct blk_desc *dev_desc;
-       disk_partition_t info;
+       struct disk_partition info;
        u64 sz = 0;
 
        dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);