Fix watchdog reset problems on LWMON board

[platform/kernel/u-boot.git] / common / cmd_ext2.c

diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c
index f8e04ed..af836cd 100644 (file)
--- a/common/cmd_ext2.c
+++ b/common/cmd_ext2.c
@@ -41,6 +41,9 @@
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
 #include <ext2fs.h>
+#if ((CONFIG_COMMANDS & CFG_CMD_USB) && defined(CONFIG_USB_STORAGE))
+#include <usb.h>
+#endif
 
 #ifndef CONFIG_DOS_PARTITION
 #error DOS partition support must be selected
@@ -161,7 +164,7 @@ int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
        char *filename = NULL;
        char *ep;
-       int dev, part = 0;
+       int dev, part = 1;
        ulong addr = 0, part_length, filelen;
        disk_partition_t info;
        block_dev_desc_t *dev_desc = NULL;
@@ -223,7 +226,7 @@ int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        PRINTF("Using device %s%d, partition %d\n", argv[1], dev, part);
 
        if (part != 0) {
-               if (get_partition_info (&dev_desc[dev], part, &info)) {
+               if (get_partition_info (dev_desc, part, &info)) {
                        printf ("** Bad partition %d **\n", part);
                        return(1);
                }