summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-09-30 23:34:36 +0200
committerWolfgang Denk <wd@denx.de>2009-09-30 23:34:36 +0200
commit7529b4445bc4525765b003d3269bcf37fc33fac5 (patch)
treed05724960f20d8e369945d68283b60d81cdca486 /drivers
parent9e2032aa56a722af8959cd214cc1e54d59b2ba64 (diff)
parentd44e9c1736283f0abc5d3c5d28cfea8480c93a79 (diff)
downloadu-boot-imx-7529b4445bc4525765b003d3269bcf37fc33fac5.zip
u-boot-imx-7529b4445bc4525765b003d3269bcf37fc33fac5.tar.gz
u-boot-imx-7529b4445bc4525765b003d3269bcf37fc33fac5.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/davinci_nand.c3
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)
{