---

yaml --- r: 104849 b: refs/heads/master c: baabaae h: refs/heads/master i: 104847: ccda40b v: v3
git-mirror · Jul 22, 2008 · 3321a08 · 3321a08
1 parent d617ed3
commit 3321a08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a642e99babe0617febb6f402e1e063479f489db
+refs/heads/master: baabaae98125fbd1a8dc258aa95333c01cd9e206
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
@@ -893,16 +893,11 @@ config MODULE_SRCVERSION_ALL
 	  will be created for all modules.  If unsure, say N.
 
 config KMOD
-	bool "Automatic kernel module loading"
+	def_bool y
 	depends on MODULES
 	help
-	  Normally when you have selected some parts of the kernel to
-	  be created as kernel modules, you must load them (using the
-	  "modprobe" command) before you can use them. If you say Y
-	  here, some parts of the kernel will be able to load modules
-	  automatically: when a part of the kernel needs a module, it
-	  runs modprobe with the appropriate arguments, thereby
-	  loading the module if it is available.  If unsure, say Y.
+	  This is being removed soon.  These days, CONFIG_MODULES
+	  implies CONFIG_KMOD, so use that instead.
 
 config STOP_MACHINE
 	bool