Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 233103
b: refs/heads/master
c: 0742cec
h: refs/heads/master
i:
  233101: 799523c
  233099: 0632cc0
  233095: 2eb8cc3
  233087: c1ce728
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Feb 9, 2011
1 parent cc82db7 commit 2e7bc74
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 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: 3c323c01b6bd5fd01be21a8f0cdc11e55997aa06
refs/heads/master: 0742cecbd431fd057b45fd8c0d60f0907e00e17f
5 changes: 4 additions & 1 deletion trunk/drivers/staging/comedi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ config COMEDI_NI_AT_AO
config COMEDI_NI_ATMIO
tristate "NI AT-MIO E series ISA-PNP card support"
depends on ISAPNP && COMEDI_NI_TIO && COMEDI_NI_COMMON
select COMEDI_8255
default N
---help---
Enable support for National Instruments AT-MIO E series cards
Expand Down Expand Up @@ -1040,6 +1041,8 @@ config COMEDI_NI_PCIDIO
config COMEDI_NI_PCIMIO
tristate "NI PCI-MIO-E series and M series support"
depends on COMEDI_NI_TIO && COMEDI_NI_COMMON
select COMEDI_8255
select COMEDI_FC
default N
---help---
Enable support for National Instruments PCI-MIO-E series and M series
Expand Down Expand Up @@ -1164,6 +1167,7 @@ config COMEDI_NI_LABPC_CS
config COMEDI_NI_MIO_CS
tristate "NI DAQCard E series PCMCIA support"
depends on COMEDI_NI_TIO && COMEDI_NI_COMMON
select COMEDI_8255
select COMEDI_FC
default N
---help---
Expand Down Expand Up @@ -1268,7 +1272,6 @@ config COMEDI_MITE
config COMEDI_NI_TIO
tristate "NI general purpose counter support"
depends on COMEDI_MITE
select COMEDI_8255
default N
---help---
Enable support for National Instruments general purpose counters.
Expand Down

0 comments on commit 2e7bc74

Please sign in to comment.