Merge tag 'usb-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[cascardo/linux.git] / fs / fat / Kconfig

diff --git a/fs/fat/Kconfig b/fs/fat/Kconfig
index 182f9ff..3ff1772 100644 (file)
--- a/fs/fat/Kconfig
+++ b/fs/fat/Kconfig
@@ -93,8 +93,24 @@ config FAT_DEFAULT_IOCHARSET
          that most of your FAT filesystems use, and can be overridden
          with the "iocharset" mount option for FAT filesystems.
          Note that "utf8" is not recommended for FAT filesystems.
-         If unsure, you shouldn't set "utf8" here.
+         If unsure, you shouldn't set "utf8" here - select the next option
+         instead if you would like to use UTF-8 encoded file names by default.
          See <file:Documentation/filesystems/vfat.txt> for more information.
 
          Enable any character sets you need in File Systems/Native Language
          Support.
+
+config FAT_DEFAULT_UTF8
+       bool "Enable FAT UTF-8 option by default"
+       depends on VFAT_FS
+       default n
+       help
+         Set this if you would like to have "utf8" mount option set
+         by default when mounting FAT filesystems.
+
+         Even if you say Y here can always disable UTF-8 for
+         particular mount by adding "utf8=0" to mount options.
+
+         Say Y if you use UTF-8 encoding for file names, N otherwise.
+
+         See <file:Documentation/filesystems/vfat.txt> for more information.