summaryrefslogtreecommitdiff
path: root/board/zylonite
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2006-12-28 19:09:07 +0100
committerStefan Roese <sr@denx.de>2006-12-28 19:09:07 +0100
commitcce2adfb93ea31d21a2f69bbf68146dfe8c40350 (patch)
tree1485bc01fbdd9b6b8b8493c490ba4bf6f5cb4439 /board/zylonite
parent074acedbff821026ed47035e56a18600d789ce05 (diff)
parent92eb729bad876725aeea908d2addba0800620840 (diff)
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'board/zylonite')
-rw-r--r--board/zylonite/nand.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/board/zylonite/nand.c b/board/zylonite/nand.c
index 5d2cd6585f..a41714351f 100644
--- a/board/zylonite/nand.c
+++ b/board/zylonite/nand.c
@@ -448,7 +448,7 @@ static void dfc_gpio_init(void)
* Members with a "?" were not set in the merged testing-NAND branch,
* so they are not set here either.
*/
-void board_nand_init(struct nand_chip *nand)
+int board_nand_init(struct nand_chip *nand)
{
unsigned long tCH, tCS, tWH, tWP, tRH, tRP, tRP_high, tR, tWHR, tAR;
@@ -576,6 +576,7 @@ void board_nand_init(struct nand_chip *nand)
nand->cmdfunc = dfc_cmdfunc;
nand->autooob = &delta_oob;
nand->badblock_pattern = &delta_bbt_descr;
+ return 0;
}
#else