Merge with git://www.denx.de/git/u-boot.git

[platform/kernel/u-boot.git] / board / netstar / nand.c

diff --git a/board/netstar/nand.c b/board/netstar/nand.c
index 4ce6ca1..d47e1d8 100644 (file)
--- a/board/netstar/nand.c
+++ b/board/netstar/nand.c
@@ -22,7 +22,7 @@
 
 #include <common.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND)
 
 #include <nand.h>
 
@@ -55,13 +55,13 @@ static int netstar_nand_ready(struct mtd_info *mtd)
 }
 ***/
 
-void board_nand_init(struct nand_chip *nand)
+int board_nand_init(struct nand_chip *nand)
 {
-        nand->options = NAND_SAMSUNG_LP_OPTIONS;
+       nand->options = NAND_SAMSUNG_LP_OPTIONS;
        nand->eccmode = NAND_ECC_SOFT;
-        nand->hwcontrol = netstar_nand_hwcontrol;
+       nand->hwcontrol = netstar_nand_hwcontrol;
 /*     nand->dev_ready = netstar_nand_ready; */
        nand->chip_delay = 18;
+       return 0;
 }
 #endif
-