diff --git a/[refs] b/[refs]
index b6331412c10f..b6ec9f799af7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d7fd647c236c5b4ac4a27b17180ea8d7d169c8d
+refs/heads/master: 1c115ebe224d5345e1b2dde21625631029ebdc83
diff --git a/trunk/drivers/staging/iio/Kconfig b/trunk/drivers/staging/iio/Kconfig
index beb99a547f09..4586650d65c3 100644
--- a/trunk/drivers/staging/iio/Kconfig
+++ b/trunk/drivers/staging/iio/Kconfig
@@ -4,6 +4,7 @@
 
 menuconfig IIO
 	tristate "Industrial I/O support"
+	depends on !S390
 	---help---
 	  The industrial I/O subsystem provides a unified framework for
 	  drivers for many different types of embedded sensors using a