diff options
| author | Jon Loeliger <jdl@freescale.com> | 2007-12-06 11:27:32 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2007-12-06 11:27:32 -0600 |
| commit | f743931f9b4d4e15c9bdfe726bef033ea1f1402c (patch) | |
| tree | 02c4f32797f779014b5eea46856aa50a98c65dd1 /common/cmd_flash.c | |
| parent | 83c5c9b71b451dd62af5dcbddbbe291ee3a58a6e (diff) | |
| parent | 41be969f4957115ed7b1fe8b890bfaee99d7a7a2 (diff) | |
| download | u-boot-imx-f743931f9b4d4e15c9bdfe726bef033ea1f1402c.zip u-boot-imx-f743931f9b4d4e15c9bdfe726bef033ea1f1402c.tar.gz u-boot-imx-f743931f9b4d4e15c9bdfe726bef033ea1f1402c.tar.bz2 | |
Merge commit 'wd/master'
Diffstat (limited to 'common/cmd_flash.c')
| -rw-r--r-- | common/cmd_flash.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/common/cmd_flash.c b/common/cmd_flash.c index 11c8857..f56443e 100644 --- a/common/cmd_flash.c +++ b/common/cmd_flash.c @@ -31,8 +31,6 @@ #include <dataflash.h> #endif -#if defined(CONFIG_CMD_FLASH) - #if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) #include <jffs2/jffs2.h> @@ -731,5 +729,3 @@ U_BOOT_CMD( #undef TMP_ERASE #undef TMP_PROT_ON #undef TMP_PROT_OFF - -#endif |