From: Scott Wood <scottwood@freescale.com>
Date: Wed, 9 Jul 2008 22:47:52 +0000 (-0500)
Subject: NAND: ifdef-protect most of nand.h when using legacy NAND.
X-Git-Tag: v1.3.4-rc1~58^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9d2e3947b2944e5bb85b4335533f8c93c58445fe;p=oweals%2Fu-boot.git

NAND: ifdef-protect most of nand.h when using legacy NAND.

Some macros such as NAND_CTL_SETALE conflict between current and legacy
NAND, being defined by the subsystem in the former case and the board
config file in the latter.

Signed-off-by: Scott Wood <scottwood@freescale.com>
---

diff --git a/include/nand.h b/include/nand.h
index 247d3465db..e1285cdae9 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -24,6 +24,9 @@
 #ifndef _NAND_H_
 #define _NAND_H_
 
+extern void nand_init(void);
+
+#ifndef CFG_NAND_LEGACY
 #include <linux/mtd/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
@@ -32,7 +35,6 @@ typedef struct mtd_info nand_info_t;
 
 extern int nand_curr_device;
 extern nand_info_t nand_info[];
-extern void nand_init(void);
 
 static inline int nand_read(nand_info_t *info, off_t ofs, size_t *len, u_char *buf)
 {
@@ -122,4 +124,5 @@ int nand_get_lock_status(nand_info_t *meminfo, ulong offset);
 void board_nand_select_device(struct nand_chip *nand, int chip);
 #endif
 
+#endif /* !CFG_NAND_LEGACY */
 #endif