Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / fs / ubifs / Kconfig

diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
index f8b0160..ba66d50 100644 (file)
--- a/fs/ubifs/Kconfig
+++ b/fs/ubifs/Kconfig
@@ -11,12 +11,6 @@ config UBIFS_FS
        help
          UBIFS is a file system for flash devices which works on top of UBI.
 
-config UBIFS_FS_XATTR
-       bool "Extended attributes support"
-       depends on UBIFS_FS
-       help
-         This option enables support of extended attributes.
-
 config UBIFS_FS_ADVANCED_COMPR
        bool "Advanced compression options"
        depends on UBIFS_FS
@@ -41,20 +35,3 @@ config UBIFS_FS_ZLIB
        default y
        help
          Zlib compresses better than LZO but it is slower. Say 'Y' if unsure.
-
-# Debugging-related stuff
-config UBIFS_FS_DEBUG
-       bool "Enable debugging support"
-       depends on UBIFS_FS
-       select DEBUG_FS
-       select KALLSYMS
-       help
-         This option enables UBIFS debugging support. It makes sure various
-         assertions, self-checks, debugging messages and test modes are compiled
-         in (this all is compiled out otherwise). Assertions are light-weight
-         and this option also enables them. Self-checks, debugging messages and
-         test modes are switched off by default. Thus, it is safe and actually
-         recommended to have debugging support enabled, and it should not slow
-         down UBIFS. You can then further enable / disable individual  debugging
-         features using UBIFS module parameters and the corresponding sysfs
-         interfaces.