[PATCH] x86: more asm cleanups

[linux-2.6] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 5d0c4be43dba1f6e929ff50fabcefcff3adaf1db..ed78d24ee4263fcfc2495b7f0efbdd6af561c10d 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -363,12 +363,15 @@ config INOTIFY
        bool "Inotify file change notification support"
        default y
        ---help---
        bool "Inotify file change notification support"
        default y
        ---help---

-         Say Y here to enable inotify support and the /dev/inotify character
-         device.  Inotify is a file change notification system and a
+         Say Y here to enable inotify support and the associated system
+         calls.  Inotify is a file change notification system and a

          replacement for dnotify.  Inotify fixes numerous shortcomings in
          dnotify and introduces several new features.  It allows monitoring
          replacement for dnotify.  Inotify fixes numerous shortcomings in
          dnotify and introduces several new features.  It allows monitoring

-         of both files and directories via a single open fd.  Multiple file
-         events are supported.
+         of both files and directories via a single open fd.  Other features
+         include multiple file events, one-shot support, and unmount
+         notification.
+
+         For more information, see Documentation/filesystems/inotify.txt

 
          If unsure, say Y.
 
 
          If unsure, say Y.
 


@@ -780,28 +783,6 @@ config SYSFS
 
        Designers of embedded systems may wish to say N here to conserve space.
 
 
        Designers of embedded systems may wish to say N here to conserve space.
 

-config DEVPTS_FS_XATTR
-       bool "/dev/pts Extended Attributes"
-       depends on UNIX98_PTYS
-       help
-         Extended attributes are name:value pairs associated with inodes by
-         the kernel or by users (see the attr(5) manual page, or visit
-         <http://acl.bestbits.at/> for details).
-
-         If unsure, say N.
-
-config DEVPTS_FS_SECURITY
-       bool "/dev/pts Security Labels"
-       depends on DEVPTS_FS_XATTR
-       help
-         Security labels support alternative access control models
-         implemented by security modules like SELinux.  This option
-         enables an extended attribute handler for file security
-         labels in the /dev/pts filesystem.
-
-         If you are not using a security module that requires using
-         extended attributes for file security labels, say N.
-

 config TMPFS
        bool "Virtual memory file system support (former shm fs)"
        help
 config TMPFS
        bool "Virtual memory file system support (former shm fs)"
        help


@@ -814,27 +795,6 @@ config TMPFS
 
          See <file:Documentation/filesystems/tmpfs.txt> for details.
 
 
          See <file:Documentation/filesystems/tmpfs.txt> for details.
 

-config TMPFS_XATTR
-       bool "tmpfs Extended Attributes"
-       depends on TMPFS
-       help
-         Extended attributes are name:value pairs associated with inodes by
-         the kernel or by users (see the attr(5) manual page, or visit
-         <http://acl.bestbits.at/> for details).
-
-         If unsure, say N.
-
-config TMPFS_SECURITY
-       bool "tmpfs Security Labels"
-       depends on TMPFS_XATTR
-       help
-         Security labels support alternative access control models
-         implemented by security modules like SELinux.  This option
-         enables an extended attribute handler for file security
-         labels in the tmpfs filesystem.
-         If you are not using a security module that requires using
-         extended attributes for file security labels, say N.
-

 config HUGETLBFS
        bool "HugeTLB file system support"
        depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || X86_64 || BROKEN
 config HUGETLBFS
        bool "HugeTLB file system support"
        depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || X86_64 || BROKEN