Browse Source

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>
Robert P. J. Day 16 years ago
parent
commit
0b0de14433
1 changed files with 4 additions and 5 deletions
  1. 4 5
      init/Kconfig

+ 4 - 5
init/Kconfig

@@ -845,9 +845,10 @@ menuconfig MODULES
 
 
 	  If unsure, say Y.
 	  If unsure, say Y.
 
 
+if MODULES
+
 config MODULE_FORCE_LOAD
 config MODULE_FORCE_LOAD
 	bool "Forced module loading"
 	bool "Forced module loading"
-	depends on MODULES
 	default n
 	default n
 	help
 	help
 	  Allow loading of modules without version information (ie. modprobe
 	  Allow loading of modules without version information (ie. modprobe
@@ -856,7 +857,6 @@ config MODULE_FORCE_LOAD
 
 
 config MODULE_UNLOAD
 config MODULE_UNLOAD
 	bool "Module unloading"
 	bool "Module unloading"
-	depends on MODULES
 	help
 	help
 	  Without this option you will not be able to unload any
 	  Without this option you will not be able to unload any
 	  modules (note that some modules may not be unloadable
 	  modules (note that some modules may not be unloadable
@@ -875,7 +875,6 @@ config MODULE_FORCE_UNLOAD
 
 
 config MODVERSIONS
 config MODVERSIONS
 	bool "Module versioning support"
 	bool "Module versioning support"
-	depends on MODULES
 	help
 	help
 	  Usually, you have to use modules compiled with your kernel.
 	  Usually, you have to use modules compiled with your kernel.
 	  Saying Y here makes it sometimes possible to use modules
 	  Saying Y here makes it sometimes possible to use modules
@@ -886,7 +885,6 @@ config MODVERSIONS
 
 
 config MODULE_SRCVERSION_ALL
 config MODULE_SRCVERSION_ALL
 	bool "Source checksum for all modules"
 	bool "Source checksum for all modules"
-	depends on MODULES
 	help
 	help
 	  Modules which contain a MODULE_VERSION get an extra "srcversion"
 	  Modules which contain a MODULE_VERSION get an extra "srcversion"
 	  field inserted into their modinfo section, which contains a
 	  field inserted into their modinfo section, which contains a
@@ -898,11 +896,12 @@ config MODULE_SRCVERSION_ALL
 
 
 config KMOD
 config KMOD
 	def_bool y
 	def_bool y
-	depends on MODULES
 	help
 	help
 	  This is being removed soon.  These days, CONFIG_MODULES
 	  This is being removed soon.  These days, CONFIG_MODULES
 	  implies CONFIG_KMOD, so use that instead.
 	  implies CONFIG_KMOD, so use that instead.
 
 
+endif # MODULES
+
 config STOP_MACHINE
 config STOP_MACHINE
 	bool
 	bool
 	default y
 	default y