projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
drivers
/
mtd
/
nand
/
s3c2410_nand.c
diff --git
a/drivers/mtd/nand/s3c2410_nand.c
b/drivers/mtd/nand/s3c2410_nand.c
index
43d8213
..
1187b9f
100644
(file)
--- a/
drivers/mtd/nand/s3c2410_nand.c
+++ b/
drivers/mtd/nand/s3c2410_nand.c
@@
-179,9
+179,7
@@
int board_nand_init(struct nand_chip *nand)
#endif
#ifdef CONFIG_S3C2410_NAND_BBT
- nand->options = NAND_USE_FLASH_BBT;
-#else
- nand->options = 0;
+ nand->bbt_options |= NAND_BBT_USE_FLASH;
#endif
debug("end of nand_init\n");