diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/mtd/nand/nand_base.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/mtd/nand/nand_base.c')
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 85cfc061d41..c54a4cbac6b 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c | |||
| @@ -1582,7 +1582,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, | |||
| 1582 | } | 1582 | } |
| 1583 | 1583 | ||
| 1584 | /** | 1584 | /** |
| 1585 | * nand_read - [MTD Interface] MTD compability function for nand_do_read_ecc | 1585 | * nand_read - [MTD Interface] MTD compatibility function for nand_do_read_ecc |
| 1586 | * @mtd: MTD device structure | 1586 | * @mtd: MTD device structure |
| 1587 | * @from: offset to read from | 1587 | * @from: offset to read from |
| 1588 | * @len: number of bytes to read | 1588 | * @len: number of bytes to read |