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/mtdchar.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/mtdchar.c')
| -rw-r--r-- | drivers/mtd/mtdchar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c index 145b3d0dc0d..4c36ef66a46 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c | |||
| @@ -234,7 +234,7 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t | |||
| 234 | * the data. For our userspace tools it is important | 234 | * the data. For our userspace tools it is important |
| 235 | * to dump areas with ecc errors ! | 235 | * to dump areas with ecc errors ! |
| 236 | * For kernel internal usage it also might return -EUCLEAN | 236 | * For kernel internal usage it also might return -EUCLEAN |
| 237 | * to signal the caller that a bitflip has occured and has | 237 | * to signal the caller that a bitflip has occurred and has |
| 238 | * been corrected by the ECC algorithm. | 238 | * been corrected by the ECC algorithm. |
| 239 | * Userspace software which accesses NAND this way | 239 | * Userspace software which accesses NAND this way |
| 240 | * must be aware of the fact that it deals with NAND | 240 | * must be aware of the fact that it deals with NAND |