diff options
| author | Scott Wood <scottwood@freescale.com> | 2009-09-28 16:33:18 -0500 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2009-09-28 16:33:18 -0500 |
| commit | d44e9c1736283f0abc5d3c5d28cfea8480c93a79 (patch) | |
| tree | 036fde4b2414fb028fd432b31416f221e350fd8c | |
| parent | ca6189db484882798f2a35a476c07e618e21f6d3 (diff) | |
| download | u-boot-imx-d44e9c1736283f0abc5d3c5d28cfea8480c93a79.zip u-boot-imx-d44e9c1736283f0abc5d3c5d28cfea8480c93a79.tar.gz u-boot-imx-d44e9c1736283f0abc5d3c5d28cfea8480c93a79.tar.bz2 | |
NAND: davinci: Fix warnings when 4-bit ECC not used
I accidentally left v2 of "NAND: DaVinci:Adding 4 BIT ECC support"
applied when I pushed the tree last merge window, and missed these fixes
which were in v3 of that patch.
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
| -rw-r--r-- | drivers/mtd/nand/davinci_nand.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index 37d8b73..eabaf3e 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -202,7 +202,6 @@ static struct nand_ecclayout nand_davinci_4bit_layout_oobfirst = { }, #endif }; -#endif static void nand_davinci_4bit_enable_hwecc(struct mtd_info *mtd, int mode) { @@ -289,7 +288,6 @@ static int nand_davinci_4bit_calculate_ecc(struct mtd_info *mtd, static int nand_davinci_4bit_correct_data(struct mtd_info *mtd, uint8_t *dat, uint8_t *read_ecc, uint8_t *calc_ecc) { - struct nand_chip *this = mtd->priv; unsigned short ecc_10bit[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; int i; unsigned int hw_4ecc[4] = { 0, 0, 0, 0 }, iserror = 0; @@ -441,6 +439,7 @@ static int nand_davinci_4bit_correct_data(struct mtd_info *mtd, uint8_t *dat, return numerrors; } +#endif /* CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST */ static int nand_davinci_dev_ready(struct mtd_info *mtd) { |