diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:51:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:51:45 -0400 |
| commit | 342ff1a1b558ebbdb8cbd55ab6a63eca8b2473ca (patch) | |
| tree | 1f967f283dade6e03897169bb29513354f49f910 /drivers/mtd/ubi | |
| parent | 50223e486cabdcf7e540e519da1f26bab3084e5d (diff) | |
| parent | 24ed7a97464db44592495f98cff8bcee02f92bc2 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
trivial: fix typo in aic7xxx comment
trivial: fix comment typo in drivers/ata/pata_hpt37x.c
trivial: typo in kernel-parameters.txt
trivial: fix typo in tracing documentation
trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c
trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c
trivial: remove unnecessary semicolons
trivial: Fix duplicated word "options" in comment
trivial: kbuild: remove extraneous blank line after declaration of usage()
trivial: improve help text for mm debug config options
trivial: doc: hpfall: accept disk device to unload as argument
trivial: doc: hpfall: reduce risk that hpfall can do harm
trivial: SubmittingPatches: Fix reference to renumbered step
trivial: fix typos "man[ae]g?ment" -> "management"
trivial: media/video/cx88: add __init/__exit macros to cx88 drivers
trivial: fix typo in CONFIG_DEBUG_FS in gcov doc
trivial: fix missing printk space in amd_k7_smp_check
trivial: fix typo s/ketymap/keymap/ in comment
trivial: fix typo "to to" in multiple files
trivial: fix typos in comments s/DGBU/DBGU/
...
Diffstat (limited to 'drivers/mtd/ubi')
| -rw-r--r-- | drivers/mtd/ubi/eba.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/ubi/ubi.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c index e4d9ef0c965a..9f87c99189a9 100644 --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c | |||
| @@ -1065,7 +1065,7 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to, | |||
| 1065 | } | 1065 | } |
| 1066 | 1066 | ||
| 1067 | /* | 1067 | /* |
| 1068 | * Now we have got to calculate how much data we have to to copy. In | 1068 | * Now we have got to calculate how much data we have to copy. In |
| 1069 | * case of a static volume it is fairly easy - the VID header contains | 1069 | * case of a static volume it is fairly easy - the VID header contains |
| 1070 | * the data size. In case of a dynamic volume it is more difficult - we | 1070 | * the data size. In case of a dynamic volume it is more difficult - we |
| 1071 | * have to read the contents, cut 0xFF bytes from the end and copy only | 1071 | * have to read the contents, cut 0xFF bytes from the end and copy only |
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h index c290f51dd178..1af08178defd 100644 --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h | |||
| @@ -570,7 +570,7 @@ void ubi_do_get_volume_info(struct ubi_device *ubi, struct ubi_volume *vol, | |||
| 570 | 570 | ||
| 571 | /* | 571 | /* |
| 572 | * ubi_rb_for_each_entry - walk an RB-tree. | 572 | * ubi_rb_for_each_entry - walk an RB-tree. |
| 573 | * @rb: a pointer to type 'struct rb_node' to to use as a loop counter | 573 | * @rb: a pointer to type 'struct rb_node' to use as a loop counter |
| 574 | * @pos: a pointer to RB-tree entry type to use as a loop counter | 574 | * @pos: a pointer to RB-tree entry type to use as a loop counter |
| 575 | * @root: RB-tree's root | 575 | * @root: RB-tree's root |
| 576 | * @member: the name of the 'struct rb_node' within the RB-tree entry | 576 | * @member: the name of the 'struct rb_node' within the RB-tree entry |