diff --git a/[refs] b/[refs]
index c3f6071a9d19..5b7ac21b407b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1ebdae514a356c71c09035f5141d94aab5e8fe4
+refs/heads/master: ae210f188614bb3d1ee3f19c64e28e3cdd44877c
diff --git a/trunk/drivers/uio/Kconfig b/trunk/drivers/uio/Kconfig
index b778ed71f636..d8ab7e668bd2 100644
--- a/trunk/drivers/uio/Kconfig
+++ b/trunk/drivers/uio/Kconfig
@@ -1,8 +1,6 @@
-menu "Userspace I/O"
-	depends on !S390
-
-config UIO
+menuconfig UIO
 	tristate "Userspace I/O drivers"
+	depends on !S390
 	default n
 	help
 	  Enable this to allow the userspace driver core code to be
@@ -13,6 +11,8 @@ config UIO
 
 	  If you don't know what to do here, say N.
 
+if UIO
+
 config UIO_CIF
 	tristate "generic Hilscher CIF Card driver"
 	depends on UIO && PCI
@@ -26,4 +26,4 @@ config UIO_CIF
 	  To compile this driver as a module, choose M here: the module
 	  will be called uio_cif.
 
-endmenu
+endif