diff --git a/[refs] b/[refs]
index 2e34c2e6b193..0fc6c0ac5fb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77e38a554aae2c3cdbf852117bc09bac6f95dae1
+refs/heads/master: 2d7197f412e75587037449960bc4c7ea06155a7f
diff --git a/trunk/arch/um/Kconfig.rest b/trunk/arch/um/Kconfig.rest
index 7b5cea75a6c4..0ccad0ff6d6e 100644
--- a/trunk/arch/um/Kconfig.rest
+++ b/trunk/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"