mtd: nand: fix initialization of BBT options
commit dfe64e2c89
Author: Sergey Lapin <slapin@ossfans.org>
Date: Mon Jan 14 03:46:50 2013 +0000
mtd: resync with Linux-3.7.1
changed the initialization of BBT options. Fix drivers
jz4740 and s3c2410 which have not been updated yet and
cause compile errors.
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
This commit is contained in:
parent
211bf20c35
commit
eab2276458
|
@ -256,7 +256,7 @@ int board_nand_init(struct nand_chip *nand)
|
|||
nand->ecc.strength = 4;
|
||||
nand->ecc.layout = &qi_lb60_ecclayout_2gb;
|
||||
nand->chip_delay = 50;
|
||||
nand->options = NAND_USE_FLASH_BBT;
|
||||
nand->bbt_options |= NAND_BBT_USE_FLASH;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -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");
|
||||
|
|
Loading…
Reference in New Issue