Merge branch 'mvebu/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[cascardo/linux.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index f544022..34e332b 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -212,6 +212,12 @@ config RANDOM32_SELFTEST
 #
 # compression support is select'ed if needed
 #
+config 842_COMPRESS
+       tristate
+
+config 842_DECOMPRESS
+       tristate
+
 config ZLIB_INFLATE
        tristate
 
@@ -396,10 +402,6 @@ config CPUMASK_OFFSTACK
          them on the stack.  This is a bit more expensive, but avoids
          stack overflow.
 
-config DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
-       bool "Disable obsolete cpumask functions" if DEBUG_PER_CPU_MAPS
-       depends on BROKEN
-
 config CPU_RMAP
        bool
        depends on SMP