Merge drm/drm-next into drm-intel-next

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

diff --git a/fs/Kconfig b/fs/Kconfig
index 7a2b11c..30b751c 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -48,7 +48,7 @@ config FS_DAX
        bool "File system based Direct Access (DAX) support"
        depends on MMU
        depends on !(ARM || MIPS || SPARC)
-       select DEV_PAGEMAP_OPS if (ZONE_DEVICE && !FS_DAX_LIMITED)
+       depends on ZONE_DEVICE || FS_DAX_LIMITED
        select FS_IOMAP
        select DAX
        help
@@ -344,7 +344,7 @@ config LOCKD
 
 config LOCKD_V4
        bool
-       depends on NFSD_V3 || NFS_V3
+       depends on NFSD || NFS_V3
        depends on FILE_LOCKING
        default y
 
@@ -369,8 +369,8 @@ source "fs/ksmbd/Kconfig"
 
 config SMBFS_COMMON
        tristate
-       default y if CIFS=y
-       default m if CIFS=m
+       default y if CIFS=y || SMB_SERVER=y
+       default m if CIFS=m || SMB_SERVER=m
 
 source "fs/coda/Kconfig"
 source "fs/afs/Kconfig"