summaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-12-06 17:31:30 -0500
committerLen Brown <len.brown@intel.com>2005-12-06 17:31:30 -0500
commit3d5271f9883cba7b54762bc4fe027d4172f06db7 (patch)
treeab8a881a14478598a0c8bda0d26c62cdccfffd6d /init/Kconfig
parent378b2556f4e09fa6f87ff0cb5c4395ff28257d02 (diff)
parent9115a6c787596e687df03010d97fccc5e0762506 (diff)
Pull release into acpica branch
Diffstat (limited to 'init/Kconfig')
-rw-r--r--init/Kconfig8
1 files changed, 6 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig
index d5a1a1228fa..ea097e0a9c0 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -60,8 +60,8 @@ config INIT_ENV_ARG_LIMIT
default 32 if !USERMODE
default 128 if USERMODE
help
- This is the value of the two limits on the number of argument and of
- env.var passed to init from the kernel command line.
+ Maximum of each of the number of arguments and environment
+ variables passed to init from the kernel command line.
endmenu
@@ -501,3 +501,7 @@ config STOP_MACHINE
help
Need stop_machine() primitive.
endmenu
+
+menu "Block layer"
+source "block/Kconfig"
+endmenu