Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363435
b: refs/heads/master
c: f165d81
h: refs/heads/master
i:
  363433: eac0cbf
  363431: afe6b05
v: v3
  • Loading branch information
Frank Mori Hess authored and Greg Kroah-Hartman committed Mar 12, 2013
1 parent 53dfc8c commit 104bb22
Show file tree
Hide file tree
Showing 4 changed files with 433 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 94cc409be782a3fdbf86a4f8c9dd8c93e0fea395
refs/heads/master: f165d815d50f158be43aa12c5c800fd27bbecad3
10 changes: 10 additions & 0 deletions trunk/drivers/staging/comedi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,16 @@ config COMEDI_ADV_PCI1723
To compile this driver as a module, choose M here: the module will be
called adv_pci1723.

config COMEDI_ADV_PCI1724
tristate "Advantech PCI-1724U support"
---help---
Enable support for Advantech PCI-1724U cards. These are 32-channel
analog output cards with voltage and current loop output ranges and
14-bit resolution.

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

config COMEDI_ADV_PCI_DIO
tristate "Advantech PCI DIO card support"
select COMEDI_8255
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 @@ -75,6 +75,7 @@ obj-$(CONFIG_COMEDI_ADL_PCI9111) += adl_pci9111.o
obj-$(CONFIG_COMEDI_ADL_PCI9118) += adl_pci9118.o
obj-$(CONFIG_COMEDI_ADV_PCI1710) += adv_pci1710.o
obj-$(CONFIG_COMEDI_ADV_PCI1723) += adv_pci1723.o
obj-$(CONFIG_COMEDI_ADV_PCI1724) += adv_pci1724.o
obj-$(CONFIG_COMEDI_ADV_PCI_DIO) += adv_pci_dio.o
obj-$(CONFIG_COMEDI_AMPLC_DIO200) += amplc_dio200.o
obj-$(CONFIG_COMEDI_AMPLC_PC236) += amplc_pc236.o
Expand Down
Loading

0 comments on commit 104bb22

Please sign in to comment.