Merge branch 'linus' into core/printk

[linux-2.6-omap-h63xx.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index daa481824d9c9a68438d097ec4bedd9c2114dc2e..8ade0a7a91e09ae11e4921338d5363ee74803d05 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -2,6 +2,9 @@
 # Library configuration
 #
 
+config BINARY_PRINTF
+       def_bool n
+
 menu "Library routines"
 
 config BITREVERSE
@@ -150,12 +153,6 @@ config TEXTSEARCH_BM
 config TEXTSEARCH_FSM
        tristate
 
-#
-# plist support is select#ed if needed
-#
-config PLIST
-       boolean
-
 config HAS_IOMEM
        boolean
        depends on !NO_IOMEM
@@ -188,4 +185,10 @@ config DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
        bool "Disable obsolete cpumask functions" if DEBUG_PER_CPU_MAPS
        depends on EXPERIMENTAL && BROKEN
 
+#
+# Netlink attribute parsing support is select'ed if needed
+#
+config NLATTR
+       bool
+
 endmenu