Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317580
b: refs/heads/master
c: a771988
h: refs/heads/master
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Jun 26, 2012
1 parent 724a3d6 commit 6f5852b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7ac21b82be42b6414ba9fa170263376ee2326925
refs/heads/master: a77198816e193a88b9c10ce13f0d2e172df0c6b5
23 changes: 11 additions & 12 deletions trunk/drivers/staging/comedi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1105,6 +1105,14 @@ config COMEDI_SSV_DNP
To compile this driver as a module, choose M here: the module will be
called ssv_dnp.

config COMEDI_MITE
tristate

config COMEDI_NI_TIOCMD
tristate
select COMEDI_NI_TIO
select COMEDI_MITE

endif # COMEDI_PCI_DRIVERS

menuconfig COMEDI_PCMCIA_DRIVERS
Expand Down Expand Up @@ -1245,18 +1253,6 @@ config COMEDI_VMK80XX

endif # COMEDI_USB_DRIVERS

config COMEDI_MITE
tristate
depends on PCI

config COMEDI_NI_TIO
tristate

config COMEDI_NI_TIOCMD
tristate
select COMEDI_NI_TIO
select COMEDI_MITE

config COMEDI_8255
tristate "Generic 8255 support"
---help---
Expand Down Expand Up @@ -1290,4 +1286,7 @@ config COMEDI_DAS08
tristate
select COMEDI_8255

config COMEDI_NI_TIO
tristate

endif # COMEDI

0 comments on commit 6f5852b

Please sign in to comment.