Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 65781de44fc0e04998d3daa2bee8b51e215d9844..771f457402d4937c4ca29d448ab886b5d4959ae8 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -47,10 +47,12 @@ source "fs/nilfs2/Kconfig"
 
 endif # BLOCK
 
 
 endif # BLOCK
 

+config EXPORTFS
+       tristate
+

 config FILE_LOCKING
        bool "Enable POSIX file locking API" if EMBEDDED
        default y
 config FILE_LOCKING
        bool "Enable POSIX file locking API" if EMBEDDED
        default y

-       select BKL # while lockd still uses it.

        help
          This option enables standard file locking support, required
           for filesystems like NFS and for the flock() system
        help
          This option enables standard file locking support, required
           for filesystems like NFS and for the flock() system


@@ -60,7 +62,6 @@ source "fs/notify/Kconfig"
 
 source "fs/quota/Kconfig"
 
 
 source "fs/quota/Kconfig"
 

-source "fs/autofs/Kconfig"

 source "fs/autofs4/Kconfig"
 source "fs/fuse/Kconfig"
 
 source "fs/autofs4/Kconfig"
 source "fs/fuse/Kconfig"
 


@@ -222,9 +223,6 @@ config LOCKD_V4
        depends on FILE_LOCKING
        default y
 
        depends on FILE_LOCKING
        default y
 

-config EXPORTFS
-       tristate
-

 config NFS_ACL_SUPPORT
        tristate
        select FS_POSIX_ACL
 config NFS_ACL_SUPPORT
        tristate
        select FS_POSIX_ACL


@@ -235,7 +233,6 @@ config NFS_COMMON
        default y
 
 source "net/sunrpc/Kconfig"
        default y
 
 source "net/sunrpc/Kconfig"

-source "fs/smbfs/Kconfig"

 source "fs/ceph/Kconfig"
 source "fs/cifs/Kconfig"
 source "fs/ncpfs/Kconfig"
 source "fs/ceph/Kconfig"
 source "fs/cifs/Kconfig"
 source "fs/ncpfs/Kconfig"