diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /drivers/mtd/nand | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index eed3271b99cc..dfe56e03e48b 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c | |||
| @@ -1493,6 +1493,7 @@ static void nand_write_page_syndrome(struct mtd_info *mtd, | |||
| 1493 | * @buf: the data to write | 1493 | * @buf: the data to write |
| 1494 | * @page: page number to write | 1494 | * @page: page number to write |
| 1495 | * @cached: cached programming | 1495 | * @cached: cached programming |
| 1496 | * @raw: use _raw version of write_page | ||
| 1496 | */ | 1497 | */ |
| 1497 | static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip, | 1498 | static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip, |
| 1498 | const uint8_t *buf, int page, int cached, int raw) | 1499 | const uint8_t *buf, int page, int cached, int raw) |