summaryrefslogtreecommitdiff
path: root/include/linux/mtd/nand.h
diff options
context:
space:
mode:
authorBartlomiej Sieka <tur@semihalf.com>2006-02-24 09:37:22 +0100
committerBartlomiej Sieka <tur@pollux.(none)>2006-02-24 09:37:22 +0100
commit038ccac511214b062c56f22b9413f784b86bcd87 (patch)
tree9925a8bb04e791550c76e864c5821b12fc478e2e /include/linux/mtd/nand.h
parent84e106c09d324e345f335d2edef246d0b4c9131a (diff)
parent8e9655f863246db60c51140153186acc2afdc855 (diff)
downloadu-boot-imx-038ccac511214b062c56f22b9413f784b86bcd87.zip
u-boot-imx-038ccac511214b062c56f22b9413f784b86bcd87.tar.gz
u-boot-imx-038ccac511214b062c56f22b9413f784b86bcd87.tar.bz2
Merge with /home/wd/git/u-boot/testing-NAND/ to add new NAND handling.
Diffstat (limited to 'include/linux/mtd/nand.h')
-rw-r--r--include/linux/mtd/nand.h5
1 files changed, 4 insertions, 1 deletions
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 @@ struct nand_flash_dev {
#define NAND_JFFS2_OOB16_FSDALEN 8
unsigned long nand_probe(unsigned long physadr);
-
+#endif /* !CONFIG_NEW_NAND_CODE */
#endif /* __LINUX_MTD_NAND_H */