Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363992
b: refs/heads/master
c: 5c7bfad
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 9, 2013
1 parent b0182b6 commit 0799a46
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 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: 742363243875a1969124909d2e81f23ae287915f
refs/heads/master: 5c7bfad82364090fa9dbd831662bdf05ee7e36df
20 changes: 12 additions & 8 deletions trunk/drivers/staging/comedi/drivers/rti800.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,20 @@ static const struct comedi_lrange range_rti800_ai_unipolar = {
};

struct rti800_board {

const char *name;
int has_ao;
};

static const struct rti800_board rti800_boardtypes[] = {
{
.name = "rti800",
.has_ao = 0,
}, {
.name = "rti815",
.has_ao = 1,
},
};

struct rti800_private {
enum {
adc_diff, adc_pseudodiff, adc_singleended
Expand Down Expand Up @@ -438,18 +447,13 @@ static void rti800_detach(struct comedi_device *dev)
free_irq(dev->irq, dev);
}

static const struct rti800_board boardtypes[] = {
{ "rti800", 0 },
{ "rti815", 1 },
};

static struct comedi_driver rti800_driver = {
.driver_name = "rti800",
.module = THIS_MODULE,
.attach = rti800_attach,
.detach = rti800_detach,
.num_names = ARRAY_SIZE(boardtypes),
.board_name = &boardtypes[0].name,
.num_names = ARRAY_SIZE(rti800_boardtypes),
.board_name = &rti800_boardtypes[0].name,
.offset = sizeof(struct rti800_board),
};
module_comedi_driver(rti800_driver);
Expand Down

0 comments on commit 0799a46

Please sign in to comment.