aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2008-08-04 13:31:32 -0400
committerSam Ravnborg <sam@ravnborg.org>2008-08-06 22:14:04 +0200
commit0b0de144333fca335a0111a6f9c59176ad43ba0a (patch)
tree8cbadef138f6c40c465021740bcb7b147aad4d62
parent0758416325dc75e203ab974aa5e937bef7d2afef (diff)
downloadmrst-s0i3-test-0b0de144333fca335a0111a6f9c59176ad43ba0a.tar.gz
mrst-s0i3-test-0b0de144333fca335a0111a6f9c59176ad43ba0a.tar.xz
mrst-s0i3-test-0b0de144333fca335a0111a6f9c59176ad43ba0a.zip
Kconfig: Extend "menuconfig" for modules to simplify Kconfig file
Given that the init/Kconfig file uses a "menuconfig" directive for modules already, might as well wrap all the submenu entries in an "if" to toss all those dependencies. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--init/Kconfig9
1 files changed, 4 insertions, 5 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 7e6dae1ae72..b678803decc 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -845,9 +845,10 @@ menuconfig MODULES
If unsure, say Y.
+if MODULES
+
config MODULE_FORCE_LOAD
bool "Forced module loading"
- depends on MODULES
default n
help
Allow loading of modules without version information (ie. modprobe
@@ -856,7 +857,6 @@ config MODULE_FORCE_LOAD
config MODULE_UNLOAD
bool "Module unloading"
- depends on MODULES
help
Without this option you will not be able to unload any
modules (note that some modules may not be unloadable
@@ -875,7 +875,6 @@ config MODULE_FORCE_UNLOAD
config MODVERSIONS
bool "Module versioning support"
- depends on MODULES
help
Usually, you have to use modules compiled with your kernel.
Saying Y here makes it sometimes possible to use modules
@@ -886,7 +885,6 @@ config MODVERSIONS
config MODULE_SRCVERSION_ALL
bool "Source checksum for all modules"
- depends on MODULES
help
Modules which contain a MODULE_VERSION get an extra "srcversion"
field inserted into their modinfo section, which contains a
@@ -898,11 +896,12 @@ config MODULE_SRCVERSION_ALL
config KMOD
def_bool y
- depends on MODULES
help
This is being removed soon. These days, CONFIG_MODULES
implies CONFIG_KMOD, so use that instead.
+endif # MODULES
+
config STOP_MACHINE
bool
default y