diff --git a/[refs] b/[refs]
index ab99b3fa716c..f812e4040355 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77f047e25716cdefae7273d4e55f2cf74144c553
+refs/heads/master: ba2450b89bd9dce7d8926d919a67ed515be3e05f
diff --git a/trunk/drivers/staging/comedi/Kconfig b/trunk/drivers/staging/comedi/Kconfig
index 283ea0ceddf0..8ce307e64b58 100644
--- a/trunk/drivers/staging/comedi/Kconfig
+++ b/trunk/drivers/staging/comedi/Kconfig
@@ -1,7 +1,7 @@
 config COMEDI
 	tristate "Data acquisition support (comedi)"
 	default N
-	depends on m && (PCI || PCMCIA || PCCARD || USB)
+	depends on m
 	---help---
 	  Enable support a wide range of data acquisition devices
 	  for Linux.
@@ -57,7 +57,6 @@ config COMEDI_TEST
 
 config COMEDI_PARPORT
 	tristate "Parallel port support"
-	depends on PARPORT_PC
 	default N
 	---help---
 	  Enable support for the standard parallel port.
@@ -1266,7 +1265,7 @@ config COMEDI_MITE
 
 config COMEDI_NI_TIO
 	tristate "NI general purpose counter support"
-	depends on COMEDI_MITE
+	select COMEDI_MITE
 	default N
 	---help---
 	  Enable support for National Instruments general purpose counters.