Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index b8bca91..e4fc02d 100644
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -33,6 +33,7 @@
#include <unistd.h>
#ifdef MTD_OLD
+# include <stdint.h>
# include <linux/mtd/mtd.h>
#else
# define __user /* nothing */
@@ -397,7 +398,7 @@
static int flash_io (int mode)
{
int fd, fdr, rc, otherdev, len, resid;
- erase_info_t erase;
+ struct erase_info_user erase;
char *data = NULL;
if ((fd = open (DEVNAME (curdev), mode)) < 0) {