diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
| commit | 811158b147a503fbdf9773224004ffd32002d1fe (patch) | |
| tree | 0a11dcfefe721bfc38ea9f1f4a238822dbae0dda /fs/ubifs | |
| parent | 4e76c5ccd5ac9bd003467d3bb0f49b18572dd4cd (diff) | |
| parent | b26e0ed4936b743b693a4cc1413561fa3e4eaf65 (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: (28 commits)
trivial: Update my email address
trivial: NULL noise: drivers/mtd/tests/mtd_*test.c
trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h
trivial: Fix misspelling of "Celsius".
trivial: remove unused variable 'path' in alloc_file()
trivial: fix a pdlfush -> pdflush typo in comment
trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL
trivial: wusb: Storage class should be before const qualifier
trivial: drivers/char/bsr.c: Storage class should be before const qualifier
trivial: h8300: Storage class should be before const qualifier
trivial: fix where cgroup documentation is not correctly referred to
trivial: Give the right path in Documentation example
trivial: MTD: remove EOL from MODULE_DESCRIPTION
trivial: Fix typo in bio_split()'s documentation
trivial: PWM: fix of #endif comment
trivial: fix typos/grammar errors in Kconfig texts
trivial: Fix misspelling of firmware
trivial: cgroups: documentation typo and spelling corrections
trivial: Update contact info for Jochen Hein
trivial: fix typo "resgister" -> "register"
...
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig index e35b54d5059d..830e3f76f442 100644 --- a/fs/ubifs/Kconfig +++ b/fs/ubifs/Kconfig | |||
| @@ -22,7 +22,7 @@ config UBIFS_FS_ADVANCED_COMPR | |||
| 22 | depends on UBIFS_FS | 22 | depends on UBIFS_FS |
| 23 | help | 23 | help |
| 24 | This option allows to explicitly choose which compressions, if any, | 24 | This option allows to explicitly choose which compressions, if any, |
| 25 | are enabled in UBIFS. Removing compressors means inbility to read | 25 | are enabled in UBIFS. Removing compressors means inability to read |
| 26 | existing file systems. | 26 | existing file systems. |
| 27 | 27 | ||
| 28 | If unsure, say 'N'. | 28 | If unsure, say 'N'. |
| @@ -32,7 +32,7 @@ config UBIFS_FS_LZO | |||
| 32 | depends on UBIFS_FS | 32 | depends on UBIFS_FS |
| 33 | default y | 33 | default y |
| 34 | help | 34 | help |
| 35 | LZO compressor is generally faster then zlib but compresses worse. | 35 | LZO compressor is generally faster than zlib but compresses worse. |
| 36 | Say 'Y' if unsure. | 36 | Say 'Y' if unsure. |
| 37 | 37 | ||
| 38 | config UBIFS_FS_ZLIB | 38 | config UBIFS_FS_ZLIB |