projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ppc4xx: Add Canyonlands NAND booting support
[platform/kernel/u-boot.git]
/
common
/
cmd_flash.c
diff --git
a/common/cmd_flash.c
b/common/cmd_flash.c
index
11c8857
..
f56443e
100644
(file)
--- 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