Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[mv-sheeva.git] / arch / um / Kconfig.rest

diff --git a/arch/um/Kconfig.rest b/arch/um/Kconfig.rest
index 7b5cea75a6c4ab5b735e02d325639b013de2e8ea..0ccad0ff6d6ea5a155bbfcd5c33b7927263a494d 100644 (file)
--- a/arch/um/Kconfig.rest
+++ b/arch/um/Kconfig.rest
@@ -36,7 +36,7 @@ source "drivers/leds/Kconfig"
 
 #This is just to shut up some Kconfig warnings, so no prompt.
 config INPUT
-       bool
+       tristate
        default n
 
 source "arch/um/Kconfig.debug"