diff options
author | Wolfgang Denk <wd@denx.de> | 2006-12-24 01:30:04 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2006-12-24 01:30:04 +0100 |
commit | bc5556d62b6ebe6cb4302aebec9e7bbf1affd2ea (patch) | |
tree | bcb2fa6abc6e2b2ed36a06cd77bb7f869abbe92f /board/delta/nand.c | |
parent | 1b3c360c235dc684ec06c2d5f183f0a282ce45e2 (diff) | |
parent | fa23044564091f05d9695beb7b5b9a931e7f41a4 (diff) | |
download | u-boot-imx-bc5556d62b6ebe6cb4302aebec9e7bbf1affd2ea.zip u-boot-imx-bc5556d62b6ebe6cb4302aebec9e7bbf1affd2ea.tar.gz u-boot-imx-bc5556d62b6ebe6cb4302aebec9e7bbf1affd2ea.tar.bz2 |
Merge with /home/hs/TQ/u-boot-dev
Diffstat (limited to 'board/delta/nand.c')
-rw-r--r-- | board/delta/nand.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/board/delta/nand.c b/board/delta/nand.c index fe648fc..d170938 100644 --- a/board/delta/nand.c +++ b/board/delta/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 |