Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324617
b: refs/heads/master
c: 14e065b
h: refs/heads/master
i:
  324615: c9f7c52
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 4, 2012
1 parent ae71f4e commit 7591f85
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 24 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: e199ec9521602ec18d727c3a36618ef6b532f72f
refs/heads/master: 14e065b3a1dba2b29fc55d92512dad8761e098cf
23 changes: 0 additions & 23 deletions trunk/drivers/staging/comedi/drivers/adv_pci1710.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ static const struct boardtype boardtypes[] = {
.have_irq = 1,
.cardtype = TYPE_PCI171X,
.n_aichan = 16,
.n_aichand = 0,
.n_aochan = 2,
.n_dichan = 16,
.n_dochan = 16,
Expand All @@ -267,53 +266,31 @@ static const struct boardtype boardtypes[] = {
.cardtype = TYPE_PCI1713,
.n_aichan = 32,
.n_aichand = 16,
.n_aochan = 0,
.n_dichan = 0,
.n_dochan = 0,
.n_counter = 0,
.ai_maxdata = 0x0fff,
.ao_maxdata = 0x0000,
.rangelist_ai = &range_pci1710_3,
.rangecode_ai = range_codes_pci1710_3,
.rangelist_ao = NULL,
.ai_ns_min = 10000,
.fifo_half_size = 2048,
}, {
.name = "pci1720",
.device_id = 0x1720,
.iorange = IORANGE_1720,
.have_irq = 0,
.cardtype = TYPE_PCI1720,
.n_aichan = 0,
.n_aichand = 0,
.n_aochan = 4,
.n_dichan = 0,
.n_dochan = 0,
.n_counter = 0,
.ai_maxdata = 0x0000,
.ao_maxdata = 0x0fff,
.rangelist_ai = NULL,
.rangecode_ai = NULL,
.rangelist_ao = &range_pci1720,
.ai_ns_min = 0,
.fifo_half_size = 0,
}, {
.name = "pci1731",
.device_id = 0x1731,
.iorange = IORANGE_171x,
.have_irq = 1,
.cardtype = TYPE_PCI171X,
.n_aichan = 16,
.n_aichand = 0,
.n_aochan = 0,
.n_dichan = 16,
.n_dochan = 16,
.n_counter = 0,
.ai_maxdata = 0x0fff,
.ao_maxdata = 0x0000,
.rangelist_ai = &range_pci17x1,
.rangecode_ai = range_codes_pci17x1,
.rangelist_ao = NULL,
.ai_ns_min = 10000,
.fifo_half_size = 512,
}, {
Expand Down

0 comments on commit 7591f85

Please sign in to comment.