Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / common / cmd_flash.c

diff --git a/common/cmd_flash.c b/common/cmd_flash.c
index 4493948ec4ecbcce6fb1e5e12d427e30064dcd29..bd49b796c64dbd361c4c4c08787665d6298e84d7 100644 (file)
--- a/common/cmd_flash.c
+++ b/common/cmd_flash.c
@@ -459,15 +459,15 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        flash_info_t *info;
        ulong bank;
        int i, n, sect_first, sect_last;
-#endif /* CONFIG_SYS_NO_FLASH */
-#if !defined(CONFIG_SYS_NO_FLASH) || defined(CONFIG_HAS_DATAFLASH)
-       ulong addr_first, addr_last;
-#endif
 #if defined(CONFIG_CMD_MTDPARTS)
        struct mtd_device *dev;
        struct part_info *part;
        u8 dev_type, dev_num, pnum;
 #endif
+#endif /* CONFIG_SYS_NO_FLASH */
+#if !defined(CONFIG_SYS_NO_FLASH) || defined(CONFIG_HAS_DATAFLASH)
+       ulong addr_first, addr_last;
+#endif
 #ifdef CONFIG_HAS_DATAFLASH
        int status;
 #endif