summaryrefslogtreecommitdiff
path: root/lib/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-06-29 23:57:46 (GMT)
committerLen Brown <len.brown@intel.com>2006-06-29 23:57:46 (GMT)
commitd120cfb544ed6161b9d32fb6c4648c471807ee6b (patch)
tree7757ad0198d8df76ff5c60f939a687687c41da00 /lib/Kconfig
parent9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff)
parentbf7e8511088963078484132636839b59e25cf14f (diff)
downloadlinux-d120cfb544ed6161b9d32fb6c4648c471807ee6b.tar.xz
merge linus into release branch
Conflicts: drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'lib/Kconfig')
-rw-r--r--lib/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/Kconfig b/lib/Kconfig
index 3de9335..f629934 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -86,4 +86,10 @@ config TEXTSEARCH_BM
config TEXTSEARCH_FSM
tristate
+#
+# plist support is select#ed if needed
+#
+config PLIST
+ boolean
+
endmenu