diff options
-rw-r--r-- | init/Kconfig | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/init/Kconfig b/init/Kconfig index 7e6dae1ae727..b678803deccf 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -845,9 +845,10 @@ menuconfig MODULES | |||
845 | 845 | ||
846 | If unsure, say Y. | 846 | If unsure, say Y. |
847 | 847 | ||
848 | if MODULES | ||
849 | |||
848 | config MODULE_FORCE_LOAD | 850 | config MODULE_FORCE_LOAD |
849 | bool "Forced module loading" | 851 | bool "Forced module loading" |
850 | depends on MODULES | ||
851 | default n | 852 | default n |
852 | help | 853 | help |
853 | Allow loading of modules without version information (ie. modprobe | 854 | Allow loading of modules without version information (ie. modprobe |
@@ -856,7 +857,6 @@ config MODULE_FORCE_LOAD | |||
856 | 857 | ||
857 | config MODULE_UNLOAD | 858 | config MODULE_UNLOAD |
858 | bool "Module unloading" | 859 | bool "Module unloading" |
859 | depends on MODULES | ||
860 | help | 860 | help |
861 | Without this option you will not be able to unload any | 861 | Without this option you will not be able to unload any |
862 | modules (note that some modules may not be unloadable | 862 | modules (note that some modules may not be unloadable |
@@ -875,7 +875,6 @@ config MODULE_FORCE_UNLOAD | |||
875 | 875 | ||
876 | config MODVERSIONS | 876 | config MODVERSIONS |
877 | bool "Module versioning support" | 877 | bool "Module versioning support" |
878 | depends on MODULES | ||
879 | help | 878 | help |
880 | Usually, you have to use modules compiled with your kernel. | 879 | Usually, you have to use modules compiled with your kernel. |
881 | Saying Y here makes it sometimes possible to use modules | 880 | Saying Y here makes it sometimes possible to use modules |
@@ -886,7 +885,6 @@ config MODVERSIONS | |||
886 | 885 | ||
887 | config MODULE_SRCVERSION_ALL | 886 | config MODULE_SRCVERSION_ALL |
888 | bool "Source checksum for all modules" | 887 | bool "Source checksum for all modules" |
889 | depends on MODULES | ||
890 | help | 888 | help |
891 | Modules which contain a MODULE_VERSION get an extra "srcversion" | 889 | Modules which contain a MODULE_VERSION get an extra "srcversion" |
892 | field inserted into their modinfo section, which contains a | 890 | field inserted into their modinfo section, which contains a |
@@ -898,11 +896,12 @@ config MODULE_SRCVERSION_ALL | |||
898 | 896 | ||
899 | config KMOD | 897 | config KMOD |
900 | def_bool y | 898 | def_bool y |
901 | depends on MODULES | ||
902 | help | 899 | help |
903 | This is being removed soon. These days, CONFIG_MODULES | 900 | This is being removed soon. These days, CONFIG_MODULES |
904 | implies CONFIG_KMOD, so use that instead. | 901 | implies CONFIG_KMOD, so use that instead. |
905 | 902 | ||
903 | endif # MODULES | ||
904 | |||
906 | config STOP_MACHINE | 905 | config STOP_MACHINE |
907 | bool | 906 | bool |
908 | default y | 907 | default y |