Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267381
b: refs/heads/master
c: dd89e20
h: refs/heads/master
i:
  267379: 5599f7e
v: v3
  • Loading branch information
Bernd Porr authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent e283640 commit 8f9c417
Show file tree
Hide file tree
Showing 4 changed files with 2,895 additions and 6 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: d6aa8366dde1656f859b6ebf5face1718793a467
refs/heads/master: dd89e20d7e9d507b3122de2f79661b5fc2c2198e
18 changes: 13 additions & 5 deletions trunk/drivers/staging/comedi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1244,11 +1244,10 @@ config COMEDI_DT9812
called dt9812.

config COMEDI_USBDUX
tristate "ITL USBDUX support"
tristate "ITL USB-DUX-D support"
default N
---help---
Enable support for the University of Stirling USB DAQ and INCITE
Technology Limited driver
Enable support for the Incite Technology Ltd USB-DUX-D Board

To compile this driver as a module, choose M here: the module will be
called usbdux.
Expand All @@ -1258,12 +1257,21 @@ config COMEDI_USBDUXFAST
select COMEDI_FC
default N
---help---
Enable support for the University of Stirling USB-DUXfast and INCITE
Technology Limited driver
Enable support for the Incite Technology Ltd USB-DUXfast Board

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

config COMEDI_USBDUXSIGMA
tristate "ITL USB-DUXsigma support"
select COMEDI_FC
default N
---help---
Enable support for the Incite Technology Ltd USB-DUXsigma Board

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

config COMEDI_VMK80XX
tristate "Velleman VM110/VM140 USB Board support"
default N
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/staging/comedi/drivers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ obj-$(CONFIG_COMEDI_QUATECH_DAQP_CS) += quatech_daqp_cs.o
obj-$(CONFIG_COMEDI_DT9812) += dt9812.o
obj-$(CONFIG_COMEDI_USBDUX) += usbdux.o
obj-$(CONFIG_COMEDI_USBDUXFAST) += usbduxfast.o
obj-$(CONFIG_COMEDI_USBDUXSIGMA) += usbduxsigma.o
obj-$(CONFIG_COMEDI_VMK80XX) += vmk80xx.o

# Comedi NI drivers
Expand Down
Loading

0 comments on commit 8f9c417

Please sign in to comment.