summaryrefslogtreecommitdiff
path: root/common/cmd_jffs2.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-12-06 11:27:32 -0600
committerJon Loeliger <jdl@freescale.com>2007-12-06 11:27:32 -0600
commitf743931f9b4d4e15c9bdfe726bef033ea1f1402c (patch)
tree02c4f32797f779014b5eea46856aa50a98c65dd1 /common/cmd_jffs2.c
parent83c5c9b71b451dd62af5dcbddbbe291ee3a58a6e (diff)
parent41be969f4957115ed7b1fe8b890bfaee99d7a7a2 (diff)
downloadu-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_jffs2.c')
-rw-r--r--common/cmd_jffs2.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c
index 513a226..efe9eb7 100644
--- a/common/cmd_jffs2.c
+++ b/common/cmd_jffs2.c
@@ -93,9 +93,6 @@
#include <jffs2/jffs2.h>
#include <linux/list.h>
#include <linux/ctype.h>
-
-#if defined(CONFIG_CMD_JFFS2)
-
#include <cramfs/cramfs_fs.h>
#if defined(CONFIG_CMD_NAND)
@@ -2191,5 +2188,3 @@ U_BOOT_CMD(
#endif /* #ifdef CONFIG_JFFS2_CMDLINE */
/***************************************************/
-
-#endif