diff --git a/[refs] b/[refs]
index b0556e1bff98..52620f0f7af8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22454cb99fc39f2629ad06a7eccb3df312f8830e
+refs/heads/master: 934da4766e5f72797118f7c014efaef567a812fc
diff --git a/trunk/drivers/uio/Kconfig b/trunk/drivers/uio/Kconfig
index a4aaab9c7ddc..78e139c935eb 100644
--- a/trunk/drivers/uio/Kconfig
+++ b/trunk/drivers/uio/Kconfig
@@ -15,7 +15,7 @@ if UIO
 
 config UIO_CIF
 	tristate "generic Hilscher CIF Card driver"
-	depends on UIO && PCI
+	depends on PCI
 	default n
 	help
 	  Driver for Hilscher CIF DeviceNet and Profibus cards.  This
@@ -28,7 +28,6 @@ config UIO_CIF
 
 config UIO_SMX
 	tristate "SMX cryptengine UIO interface"
-	depends on UIO
 	default n
 	help
 	  Userspace IO interface to the Cryptography engine found on the