Merge tag '5.15-rc-cifs-part2' of git://git.samba.org/sfrench/cifs-2.6

[linux-2.6-microblaze.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index c854725..a6313a9 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -234,8 +234,7 @@ config ARCH_SUPPORTS_HUGETLBFS
 
 config HUGETLBFS
        bool "HugeTLB file system support"
-       depends on X86 || IA64 || SPARC64 || (S390 && 64BIT) || \
-                  ARCH_SUPPORTS_HUGETLBFS || BROKEN
+       depends on X86 || IA64 || SPARC64 || ARCH_SUPPORTS_HUGETLBFS || BROKEN
        help
          hugetlbfs is a filesystem backing for HugeTLB pages, based on
          ramfs. For architectures that support it, say Y here and read
@@ -368,7 +367,7 @@ source "fs/ceph/Kconfig"
 source "fs/cifs/Kconfig"
 source "fs/ksmbd/Kconfig"
 
-config CIFS_COMMON
+config SMBFS_COMMON
        tristate
        default y if CIFS=y
        default m if CIFS=m