Merge branch 'master' into upstream

[deliverable/linux.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 97673c955484463e4181d4e3f689742bbe558a06..771f457402d4937c4ca29d448ab886b5d4959ae8 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -62,7 +62,6 @@ source "fs/notify/Kconfig"
 
 source "fs/quota/Kconfig"
 
-source "fs/autofs/Kconfig"
 source "fs/autofs4/Kconfig"
 source "fs/fuse/Kconfig"
 
@@ -234,7 +233,6 @@ config NFS_COMMON
        default y
 
 source "net/sunrpc/Kconfig"
-source "fs/smbfs/Kconfig"
 source "fs/ceph/Kconfig"
 source "fs/cifs/Kconfig"
 source "fs/ncpfs/Kconfig"