Merge branch 'master' of /home/wd/git/u-boot/master/

[u-boot] / board / netphone / netphone.c

diff --git a/board/netphone/netphone.c b/board/netphone/netphone.c
index dd03e4bd5bdd490a8b0c5e8af9d669d418c5e90b..ccc8b3ed85dfd24427c06a5fd27dd6f1393422fe 100644 (file)
--- a/board/netphone/netphone.c
+++ b/board/netphone/netphone.c
@@ -597,9 +597,9 @@ int board_early_init_f(void)
        return 0;
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND)
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/nand_legacy.h>
 
 extern ulong nand_probe(ulong physadr);
 extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];