Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317578
b: refs/heads/master
c: 2f2ac8e
h: refs/heads/master
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Jun 26, 2012
1 parent b317d7b commit ea766cd
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 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: ea8d385436d956984ab5875c778a13a91033e0d3
refs/heads/master: 2f2ac8ec08ae9e2d3f8ef24f40064a938a86b6f1
30 changes: 15 additions & 15 deletions trunk/drivers/staging/comedi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,21 @@ config COMEDI_NI_670X
To compile this driver as a module, choose M here: the module will be
called ni_670x.

config COMEDI_NI_LABPC
tristate "NI Lab-PC and compatibles ISA and PCI support"
depends on COMEDI_MITE
select COMEDI_8255
select COMEDI_FC
depends on VIRT_TO_BUS
---help---
Enable support for National Instruments Lab-PC and compatibles
Lab-PC-1200, Lab-PC-1200AI, Lab-PC+ and PCI-1200.
Kernel-level ISA plug-and-play support for the lab-pc-1200 boards has
not yet been added to the driver.

To compile this driver as a module, choose M here: the module will be
called ni_labpc.

config COMEDI_NI_PCIDIO
tristate "NI PCI-DIO32HS, PCI-DIO96, PCI-6533, PCI-6503 support"
depends on COMEDI_MITE
Expand Down Expand Up @@ -1277,21 +1292,6 @@ config COMEDI_NI_TIOCMD
To compile this driver as a module, choose M here: the module will
be called ni_tiocmd.

config COMEDI_NI_LABPC
tristate "NI Lab-PC and compatibles ISA and PCI support"
depends on COMEDI_MITE
select COMEDI_8255
select COMEDI_FC
depends on VIRT_TO_BUS
---help---
Enable support for National Instruments Lab-PC and compatibles
Lab-PC-1200, Lab-PC-1200AI, Lab-PC+ and PCI-1200.
Kernel-level ISA plug-and-play support for the lab-pc-1200 boards has
not yet been added to the driver.

To compile this driver as a module, choose M here: the module will be
called ni_labpc.

endif # COMEDI_NI_COMMON

config COMEDI_8255
Expand Down

0 comments on commit ea766cd

Please sign in to comment.