Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / configs / debris.h

diff --git a/include/configs/debris.h b/include/configs/debris.h
index 4d65f6a..dc59df9 100644 (file)
--- a/include/configs/debris.h
+++ b/include/configs/debris.h
@@ -234,7 +234,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV               "nor0"
 #define CONFIG_JFFS2_PART_SIZE         0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET       0x00000000
@@ -246,7 +246,7 @@
  * Note: fake mtd_id's used, no linux mtd map file.
  */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT         "nor0=debris-0"
 #define MTDPARTS_DEFAULT       "mtdparts=debris-0:-(jffs2)"
 */