Merge remote-tracking branch 'origin/master' into next

[firefly-linux-kernel-4.4.55.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 75cdb77fa49d2cc84459360ad939a76be2596f7e..fe01d418b09ae4d13a15b59039ef27602d1ad0f3 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -322,7 +322,7 @@ config CPUMASK_OFFSTACK
 
 config DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
        bool "Disable obsolete cpumask functions" if DEBUG_PER_CPU_MAPS
-       depends on EXPERIMENTAL && BROKEN
+       depends on BROKEN
 
 config CPU_RMAP
        bool
@@ -404,4 +404,7 @@ config OID_REGISTRY
        help
          Enable fast lookup object identifier registry.
 
+config UCS2_STRING
+        tristate
+
 endmenu