diff options
| author | Markus Klotzbücher <mk@pollux.(none)> | 2006-02-24 14:16:31 +0100 |
|---|---|---|
| committer | Markus Klotzbücher <mk@pollux.(none)> | 2006-02-24 14:16:31 +0100 |
| commit | 0377dca227cc883bbaacbe1c442cef5bd6b0e121 (patch) | |
| tree | 6c11795538a28ebd3ddb2389510e91d80c6ef1eb /include/linux/mtd/nand.h | |
| parent | 7d4d1ce48c849ec5a7e034fd4bc4d0e624075e7b (diff) | |
| parent | 038ccac511214b062c56f22b9413f784b86bcd87 (diff) | |
Merge /home/tur/nand/u-boot/
This is a first version of the testing-NAND branch merged back to main.
Diffstat (limited to 'include/linux/mtd/nand.h')
| -rw-r--r-- | include/linux/mtd/nand.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 5236904959..b0894c5e83 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 */ |