Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363448
b: refs/heads/master
c: c2a10d7
h: refs/heads/master
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Mar 14, 2013
1 parent e75560c commit 0100361
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 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: 0b33e43ab39b0080fca9c2cfab58e60af0dd4971
refs/heads/master: c2a10d70f2c84459152ba7de164701cabff53043
10 changes: 0 additions & 10 deletions trunk/drivers/staging/comedi/drivers/adv_pci1710.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ Configuration options:
#define TYPE_PCI1713 2
#define TYPE_PCI1720 3

#define IORANGE_171x 32
#define IORANGE_1720 16

#define PCI171x_AD_DATA 0 /* R: A/D data */
#define PCI171x_SOFTTRG 0 /* W: soft trigger for A/D */
#define PCI171x_RANGE 2 /* W: A/D gain/range register */
Expand Down Expand Up @@ -189,7 +186,6 @@ enum pci1710_boardid {

struct boardtype {
const char *name; /* board name */
int iorange; /* I/O range len */
char have_irq; /* 1=card support IRQ */
char cardtype; /* 0=1710& co. 2=1713, ... */
int n_aichan; /* num of A/D chans */
Expand All @@ -210,7 +206,6 @@ struct boardtype {
static const struct boardtype boardtypes[] = {
[BOARD_PCI1710] = {
.name = "pci1710",
.iorange = IORANGE_171x,
.have_irq = 1,
.cardtype = TYPE_PCI171X,
.n_aichan = 16,
Expand All @@ -229,7 +224,6 @@ static const struct boardtype boardtypes[] = {
},
[BOARD_PCI1710HG] = {
.name = "pci1710hg",
.iorange = IORANGE_171x,
.have_irq = 1,
.cardtype = TYPE_PCI171X,
.n_aichan = 16,
Expand All @@ -248,7 +242,6 @@ static const struct boardtype boardtypes[] = {
},
[BOARD_PCI1711] = {
.name = "pci1711",
.iorange = IORANGE_171x,
.have_irq = 1,
.cardtype = TYPE_PCI171X,
.n_aichan = 16,
Expand All @@ -266,7 +259,6 @@ static const struct boardtype boardtypes[] = {
},
[BOARD_PCI1713] = {
.name = "pci1713",
.iorange = IORANGE_171x,
.have_irq = 1,
.cardtype = TYPE_PCI1713,
.n_aichan = 32,
Expand All @@ -279,15 +271,13 @@ static const struct boardtype boardtypes[] = {
},
[BOARD_PCI1720] = {
.name = "pci1720",
.iorange = IORANGE_1720,
.cardtype = TYPE_PCI1720,
.n_aochan = 4,
.ao_maxdata = 0x0fff,
.rangelist_ao = &range_pci1720,
},
[BOARD_PCI1731] = {
.name = "pci1731",
.iorange = IORANGE_171x,
.have_irq = 1,
.cardtype = TYPE_PCI171X,
.n_aichan = 16,
Expand Down

0 comments on commit 0100361

Please sign in to comment.