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 /include/linux/mtd/nand.h | |
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 'include/linux/mtd/nand.h')
-rw-r--r-- | include/linux/mtd/nand.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 1aeedf27a1ff..2071b02f0526 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h | |||
@@ -358,7 +358,7 @@ struct nand_buffers { | |||
358 | * @priv: [OPTIONAL] pointer to private chip date | 358 | * @priv: [OPTIONAL] pointer to private chip date |
359 | * @errstat: [OPTIONAL] hardware specific function to perform additional error status checks | 359 | * @errstat: [OPTIONAL] hardware specific function to perform additional error status checks |
360 | * (determine if errors are correctable) | 360 | * (determine if errors are correctable) |
361 | * @write_page [REPLACEABLE] High-level page write function | 361 | * @write_page: [REPLACEABLE] High-level page write function |
362 | */ | 362 | */ |
363 | 363 | ||
364 | struct nand_chip { | 364 | struct nand_chip { |