[patch 2/8] uml: kconfig fixes [before 2.6.11]

[blaisorblade]

Change some config text (hide CONFIG_MODVERSION which is broken on UML and fix
a dummy prompt).

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
---

 linux-2.6.11-paolo/arch/um/Kconfig |    6 ++----
 linux-2.6.11-paolo/init/Kconfig    |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff -puN init/Kconfig~uml-kconfig-fixes init/Kconfig
--- linux-2.6.11/init/Kconfig~uml-kconfig-fixes	2005-02-04 03:21:03.000000000 +0100
+++ linux-2.6.11-paolo/init/Kconfig	2005-02-04 03:23:37.000000000 +0100
@@ -410,7 +410,7 @@ config OBSOLETE_MODPARM
 
 config MODVERSIONS
 	bool "Module versioning support (EXPERIMENTAL)"
-	depends on MODULES && EXPERIMENTAL
+	depends on MODULES && EXPERIMENTAL && !USERMODE
 	help
 	  Usually, you have to use modules compiled with your kernel.
 	  Saying Y here makes it sometimes possible to use modules
diff -puN arch/um/Kconfig~uml-kconfig-fixes arch/um/Kconfig
--- linux-2.6.11/arch/um/Kconfig~uml-kconfig-fixes	2005-02-04 03:26:44.762471872 +0100
+++ linux-2.6.11-paolo/arch/um/Kconfig	2005-02-04 03:26:44.764471568 +0100
@@ -313,11 +313,9 @@ if BROKEN
 	source "drivers/mtd/Kconfig"
 endif
 
+#This is just to shut up some Kconfig warnings, so no prompt.
 config INPUT
-	bool "Dummy option"
-	depends BROKEN
+	bool
 	default n
-	help
-	This is a dummy option to get rid of warnings.
 
 source "arch/um/Kconfig.debug"
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/