diff --git a/[refs] b/[refs]
index e7ed32e0d593..e981f7d9f374 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 018a2cdf1e633497bb4f01eb86a7cbffa611776d
+refs/heads/master: a6e0eb3791dcefc6dd4db53a23de5cfb18fe9a97
diff --git a/trunk/net/bluetooth/hidp/Kconfig b/trunk/net/bluetooth/hidp/Kconfig
index 4e958f7d9418..edfea772fb67 100644
--- a/trunk/net/bluetooth/hidp/Kconfig
+++ b/trunk/net/bluetooth/hidp/Kconfig
@@ -1,6 +1,6 @@
 config BT_HIDP
 	tristate "HIDP protocol support"
-	depends on BT && BT_L2CAP
+	depends on BT && BT_L2CAP && (BROKEN || !S390)
 	select INPUT
 	help
 	  HIDP (Human Interface Device Protocol) is a transport layer