diff --git a/[refs] b/[refs]
index 552f71e284ed..1c4eed97d667 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89089158d191ba0195b33ebf35f91ed217d44848
+refs/heads/master: 6fab3e1fbc83e6d61e8c28ceab513274183a96f6
diff --git a/trunk/drivers/staging/comedi/Kconfig b/trunk/drivers/staging/comedi/Kconfig
index 1502d80f6f78..bccdc12e843a 100644
--- a/trunk/drivers/staging/comedi/Kconfig
+++ b/trunk/drivers/staging/comedi/Kconfig
@@ -2,6 +2,7 @@ config COMEDI
 	tristate "Data acquisition support (comedi)"
 	default N
 	depends on m
+	depends on BROKEN || FRV || M32R || MN10300 || SUPERH || TILE || X86
 	---help---
 	  Enable support a wide range of data acquisition devices
 	  for Linux.