From: Scott Wood Date: Mon, 28 Sep 2009 21:33:18 +0000 (-0500) Subject: NAND: davinci: Fix warnings when 4-bit ECC not used X-Git-Tag: v2009.11-rc1~81^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d44e9c1736283f0abc5d3c5d28cfea8480c93a79;p=oweals%2Fu-boot.git 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 Signed-off-by: Scott Wood --- diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index 37d8b7312c..eabaf3e773 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) {