aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-06-02 11:39:11 -0400
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-06-02 11:39:11 -0400
commit1c3f45ab2f7f879ea482501c83899505c31f7539 (patch)
tree672465b3b9b3e2e26a8caf74ed64aa6885c52c13 /init
parent4bcff1b37e7c3aed914d1ce5b45994adc7dbf455 (diff)
parente0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda (diff)
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 448939d183dd..b1091d7542ce 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -443,7 +443,7 @@ config OBSOLETE_MODPARM
443 443
444config MODVERSIONS 444config MODVERSIONS
445 bool "Module versioning support (EXPERIMENTAL)" 445 bool "Module versioning support (EXPERIMENTAL)"
446 depends on MODULES && EXPERIMENTAL && !UML 446 depends on MODULES && EXPERIMENTAL
447 help 447 help
448 Usually, you have to use modules compiled with your kernel. 448 Usually, you have to use modules compiled with your kernel.
449 Saying Y here makes it sometimes possible to use modules 449 Saying Y here makes it sometimes possible to use modules