sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'master' into next

This commit is contained in:
Sascha Hauer 2011-12-19 12:06:55 +01:00
parent bfba1b6cab 790266c24d
commit 1528db0314
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mtd/nand/Kconfig
View File

@ -41,16 +41,21 @@ config NAND_INFO
Show informational strings about the vendor and nand flash type
during startup
config NAND_READ_OOB
bool
config NAND_BBT
bool
select NAND_READ_OOB
default y
prompt "support bad block tables"
help
Say y here to include support for bad block tables. This speeds
up the process of checking for bad blocks
config NAND_READ_OOB
config NAND_OOB_DEVICE
bool
select NAND_READ_OOB
default y
prompt "create a device for reading the OOB data"

2
drivers/mtd/nand/nand.c
View File

@ -186,7 +186,7 @@ static struct file_operations nand_ops = {
.lseek = dev_lseek_default,
};
#ifdef CONFIG_NAND_READ_OOB
#ifdef CONFIG_NAND_OOB_DEVICE
static ssize_t nand_read_oob(struct cdev *cdev, void *buf, size_t count, ulong offset, ulong flags)
{
struct mtd_info *info = cdev->priv;