Merge branch 'next' of git://git.denx.de/u-boot-coldfire into next

[oweals/u-boot.git] / include / configs / TQM85xx.h

diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index cc3649e50c75eea7fcdf99a792402b2872c4fbf9..d44fb07cc06944a77aec462f8354a2329b4ed8f0 100644 (file)
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -351,8 +351,6 @@
 /* NAND FLASH */
 #ifdef CONFIG_NAND
 
-#undef CONFIG_NAND_LEGACY
-
 #define CONFIG_NAND_FSL_UPM    1
 
 #define        CONFIG_MTD_NAND_ECC_JFFS2       1       /* use JFFS2 ECC        */
@@ -374,8 +372,6 @@
 
 #define NAND_BIG_DELAY_US              25      /* max tR for Samsung devices   */
 
-#define CONFIG_SYS_64BIT_VSPRINTF              /* needed for nand_util.c */
-
 #endif /* CONFIG_NAND */
 
 /*