Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[~andy/linux] / drivers / staging / lustre / lustre / Kconfig

diff --git a/drivers/staging/lustre/lustre/Kconfig b/drivers/staging/lustre/lustre/Kconfig
index 2156a44d07409c0501cba726ccb33ee99d1d9c92..209e4c7e6f8a8a8fd3da342f0609be6fc166fae9 100644 (file)
--- a/drivers/staging/lustre/lustre/Kconfig
+++ b/drivers/staging/lustre/lustre/Kconfig
@@ -16,7 +16,7 @@ config LUSTRE_FS
          this file system support as a module, choose M here: the module will
          be called lustre.
 
-         To mount Lustre file systems , you also need to install the user space
+         To mount Lustre file systems, you also need to install the user space
          mount.lustre and other user space commands which can be found in the
          lustre-client package, available from
          http://downloads.whamcloud.com/public/lustre/
@@ -55,6 +55,6 @@ config LUSTRE_TRANSLATE_ERRNOS
        default y
 
 config LUSTRE_LLITE_LLOOP
-       bool "Lustre virtual block device"
+       tristate "Lustre virtual block device"
        depends on LUSTRE_FS && BLOCK
        default m