Merge with /home/wd/git/u-boot/testing-NAND/ to add new NAND handling.
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 5236904..b0894c5 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -36,6 +36,9 @@
#ifndef __LINUX_MTD_NAND_H
#define __LINUX_MTD_NAND_H
+#ifdef CONFIG_NEW_NAND_CODE
+#include "nand_new.h"
+#else
/*
* Standard NAND flash commands
*/
@@ -196,5 +199,5 @@
#define NAND_JFFS2_OOB16_FSDALEN 8
unsigned long nand_probe(unsigned long physadr);
-
+#endif /* !CONFIG_NEW_NAND_CODE */
#endif /* __LINUX_MTD_NAND_H */